From 5ef89363888098e88c90025349a75a916a7f7b72 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Fri, 18 Mar 2022 12:53:20 +0100 Subject: [PATCH] move into root --- README.md | 27 ++++++++++++++++--- ...tmanager.yml.tmpl => alertmanager.yml.tmpl | 0 monitoring/compose.yml => compose.yml | 0 monitoring/env => env | 0 ...a-dashboards.yml => grafana-dashboards.yml | 0 ...datasources.yml => grafana-datasources.yml | 0 ...oard.json => grafana-stacks-dashboard.json | 0 ...board.json => grafana-swarm-dashboard.json | 0 ...ard.json => grafana-traefik-dashboard.json | 0 .../grafana_custom.ini => grafana_custom.ini | 0 .../loki.htpasswd.tmpl => loki.htpasswd.tmpl | 0 monitoring/loki.yml.tmpl => loki.yml.tmpl | 0 monitoring/README.md | 26 ------------------ monitoring/nginx.conf.tmpl => nginx.conf.tmpl | 0 ...prometheus.yml.tmpl => prometheus.yml.tmpl | 0 ...us_web.yml.tmpl => prometheus_web.yml.tmpl | 0 {monitoring/scripts => scripts}/genpw.py | 0 17 files changed, 24 insertions(+), 29 deletions(-) rename monitoring/alertmanager.yml.tmpl => alertmanager.yml.tmpl (100%) rename monitoring/compose.yml => compose.yml (100%) rename monitoring/env => env (100%) rename monitoring/grafana-dashboards.yml => grafana-dashboards.yml (100%) rename monitoring/grafana-datasources.yml => grafana-datasources.yml (100%) rename monitoring/grafana-stacks-dashboard.json => grafana-stacks-dashboard.json (100%) rename monitoring/grafana-swarm-dashboard.json => grafana-swarm-dashboard.json (100%) rename monitoring/grafana-traefik-dashboard.json => grafana-traefik-dashboard.json (100%) rename monitoring/grafana_custom.ini => grafana_custom.ini (100%) rename monitoring/loki.htpasswd.tmpl => loki.htpasswd.tmpl (100%) rename monitoring/loki.yml.tmpl => loki.yml.tmpl (100%) delete mode 100644 monitoring/README.md rename monitoring/nginx.conf.tmpl => nginx.conf.tmpl (100%) rename monitoring/prometheus.yml.tmpl => prometheus.yml.tmpl (100%) rename monitoring/prometheus_web.yml.tmpl => prometheus_web.yml.tmpl (100%) rename {monitoring/scripts => scripts}/genpw.py (100%) diff --git a/README.md b/README.md index 4d9d446..170d55a 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,26 @@ -# new-monitoring-experiment +## monitoring -> [notes pad](https://pad.autonomic.zone/lyCDVQbaSpusOtIZXHzHMA?view#2022-03-17-monitoring-co-hack) +> grafana/loki/prometheus -gathering stack lives [here](https://git.coopcloud.tech/knoflook/gathering). +- [g.monitor.autonomic.zone](https://g.monitor.autonomic.zone) +- [p.monitor.autonomic.zone](https://p.monitor.autonomic.zone) +- [l.monitor.autonomic.zone](https://l.monitor.autonomic.zone) + +``` +printf $(pass show hosts/swarm.autonomic.zone/minio/secret_key) | docker secret create gp_monitoring_loki_aws_secret_access_key_v1 - +printf password | docker secret create gp_monitoring_grafana_admin_password_v1 - +printf <...> | docker secret create gp_monitoring_grafana_oauth_client_secret_v1 - + +pwgen -s 64 1; ./scripts/genpw.py # input password & get hashed output for secret +printf <...> | docker secret create gp_monitoring_prometheus_admin_password_v1 - + +pwgen -s 64 1; ./scripts/genpw.py # input password & get hashed output for secret +printf <...> | docker secret create gp_monitoring_loki_admin_password_v1 - + +printf <...> | docker secret create gp_monitoring_alertmanager_smtp_password_v1 - + +set -a && source env && set +a +docker context use monitor.autonomic.zone + +docker stack deploy -c compose.yml gp_monitoring +``` diff --git a/monitoring/alertmanager.yml.tmpl b/alertmanager.yml.tmpl similarity index 100% rename from monitoring/alertmanager.yml.tmpl rename to alertmanager.yml.tmpl diff --git a/monitoring/compose.yml b/compose.yml similarity index 100% rename from monitoring/compose.yml rename to compose.yml diff --git a/monitoring/env b/env similarity index 100% rename from monitoring/env rename to env diff --git a/monitoring/grafana-dashboards.yml b/grafana-dashboards.yml similarity index 100% rename from monitoring/grafana-dashboards.yml rename to grafana-dashboards.yml diff --git a/monitoring/grafana-datasources.yml b/grafana-datasources.yml similarity index 100% rename from monitoring/grafana-datasources.yml rename to grafana-datasources.yml diff --git a/monitoring/grafana-stacks-dashboard.json b/grafana-stacks-dashboard.json similarity index 100% rename from monitoring/grafana-stacks-dashboard.json rename to grafana-stacks-dashboard.json diff --git a/monitoring/grafana-swarm-dashboard.json b/grafana-swarm-dashboard.json similarity index 100% rename from monitoring/grafana-swarm-dashboard.json rename to grafana-swarm-dashboard.json diff --git a/monitoring/grafana-traefik-dashboard.json b/grafana-traefik-dashboard.json similarity index 100% rename from monitoring/grafana-traefik-dashboard.json rename to grafana-traefik-dashboard.json diff --git a/monitoring/grafana_custom.ini b/grafana_custom.ini similarity index 100% rename from monitoring/grafana_custom.ini rename to grafana_custom.ini diff --git a/monitoring/loki.htpasswd.tmpl b/loki.htpasswd.tmpl similarity index 100% rename from monitoring/loki.htpasswd.tmpl rename to loki.htpasswd.tmpl diff --git a/monitoring/loki.yml.tmpl b/loki.yml.tmpl similarity index 100% rename from monitoring/loki.yml.tmpl rename to loki.yml.tmpl diff --git a/monitoring/README.md b/monitoring/README.md deleted file mode 100644 index 170d55a..0000000 --- a/monitoring/README.md +++ /dev/null @@ -1,26 +0,0 @@ -## monitoring - -> grafana/loki/prometheus - -- [g.monitor.autonomic.zone](https://g.monitor.autonomic.zone) -- [p.monitor.autonomic.zone](https://p.monitor.autonomic.zone) -- [l.monitor.autonomic.zone](https://l.monitor.autonomic.zone) - -``` -printf $(pass show hosts/swarm.autonomic.zone/minio/secret_key) | docker secret create gp_monitoring_loki_aws_secret_access_key_v1 - -printf password | docker secret create gp_monitoring_grafana_admin_password_v1 - -printf <...> | docker secret create gp_monitoring_grafana_oauth_client_secret_v1 - - -pwgen -s 64 1; ./scripts/genpw.py # input password & get hashed output for secret -printf <...> | docker secret create gp_monitoring_prometheus_admin_password_v1 - - -pwgen -s 64 1; ./scripts/genpw.py # input password & get hashed output for secret -printf <...> | docker secret create gp_monitoring_loki_admin_password_v1 - - -printf <...> | docker secret create gp_monitoring_alertmanager_smtp_password_v1 - - -set -a && source env && set +a -docker context use monitor.autonomic.zone - -docker stack deploy -c compose.yml gp_monitoring -``` diff --git a/monitoring/nginx.conf.tmpl b/nginx.conf.tmpl similarity index 100% rename from monitoring/nginx.conf.tmpl rename to nginx.conf.tmpl diff --git a/monitoring/prometheus.yml.tmpl b/prometheus.yml.tmpl similarity index 100% rename from monitoring/prometheus.yml.tmpl rename to prometheus.yml.tmpl diff --git a/monitoring/prometheus_web.yml.tmpl b/prometheus_web.yml.tmpl similarity index 100% rename from monitoring/prometheus_web.yml.tmpl rename to prometheus_web.yml.tmpl diff --git a/monitoring/scripts/genpw.py b/scripts/genpw.py similarity index 100% rename from monitoring/scripts/genpw.py rename to scripts/genpw.py