diff --git a/.gitmodules b/.gitmodules index 41e7438..e2777f2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -43,3 +43,6 @@ [submodule "csi-s3/node-driver-registrar"] path = csi-s3/node-driver-registrar url = https://github.com/kubernetes-csi/node-driver-registrar.git +[submodule "apps/postgresql/postgres_exporter"] + path = apps/postgresql/postgres_exporter + url = https://github.com/wrouesnel/postgres_exporter.git diff --git a/apps/postgresql/postgres_exporter b/apps/postgresql/postgres_exporter new file mode 160000 index 0000000..b12c8ab --- /dev/null +++ b/apps/postgresql/postgres_exporter @@ -0,0 +1 @@ +Subproject commit b12c8ab04e077ba493b5b490f8733b8a44e0ef22 diff --git a/apps/postgresql/postgresql-deploy.yaml b/apps/postgresql/postgresql-deploy.yaml index 97d015c..94d95e3 100644 --- a/apps/postgresql/postgresql-deploy.yaml +++ b/apps/postgresql/postgresql-deploy.yaml @@ -29,6 +29,11 @@ spec: value: pg2020 - name: PGDATA value: /var/lib/postgresql/data/pgdata +# - name: prometheus-exporter +# image: wrouesnel/postgres_exporter +# env: +# - name: DATA_SOURCE_NAME +# value: postgresql://postgres:pg2020@localhost:5432/postgres?sslmode=disable volumes: - name: postgres-disk persistentVolumeClaim: diff --git a/prometheus/additional-scrape-configs.yaml b/prometheus/additional-scrape-configs.yaml index 71b9c15..3f036cf 100644 --- a/prometheus/additional-scrape-configs.yaml +++ b/prometheus/additional-scrape-configs.yaml @@ -1,6 +1,6 @@ apiVersion: v1 data: - prometheus-additional.yaml: LSBqb2JfbmFtZTogbXlzcWxkCiAgc3RhdGljX2NvbmZpZ3M6CiAgLSB0YXJnZXRzOgogICAgLSBtYXJpYWRiLmxhbjo5MTA0Ci0gam9iX25hbWU6IG1xdHQubW9zcXVpdHRvCiAgc3RhdGljX2NvbmZpZ3M6CiAgLSB0YXJnZXRzOgogICAgLSBtcXR0Lmxhbjo5MjM0Ci0gam9iX25hbWU6IGhhcHJveHkKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGRydWNraS5jaGFvczo5MTAxCiAgICAtIHJpb3QwMS5jaGFvczo5MTAxCiAgICAtIGF1dG86OTEwMQotIGpvYl9uYW1lOiBrbGlwcGVyCiAgc3RhdGljX2NvbmZpZ3M6CiAgLSB0YXJnZXRzOgogICAgLSBkcnVja2kuY2hhb3M6MzkwMwotIGpvYl9uYW1lOiBvY3RvcHJpbnQKICBtZXRyaWNzX3BhdGg6IC9wbHVnaW4vcHJvbWV0aGV1c19leHBvcnRlci9tZXRyaWNzCiAgcGFyYW1zOgogICAgYXBpa2V5OgogICAgLSAzMEU4QjAxQkZENjc0RTVCQkQ0NDZEMDhDNDczMERGNAogIHN0YXRpY19jb25maWdzOgogIC0gdGFyZ2V0czoKICAgIC0gZHJ1Y2tpLmNoYW9zOjgwCi0gam9iX25hbWU6IG9wZW5oYWIyCiAgbWV0cmljc19wYXRoOiAvCiAgc3RhdGljX2NvbmZpZ3M6CiAgLSB0YXJnZXRzOgogICAgLSBhdXRvLmNoYW9zOjk5OTkKLSBqb2JfbmFtZTogbm9kZQogIHN0YXRpY19jb25maWdzOgogIC0gdGFyZ2V0czoKICAgIC0gZHVtb250LmNoYW9zOjkxMDAKICAgIC0gYXV0bzAxOjkxMDAKICAgIC0gZHJ1Y2tpLmNoYW9zOjkxMDAKICAgIC0gZWJpbjAxLmNoYW9zOjkxMDAKICAgIC0gZWJpbjAyLmNoYW9zOjkxMDAKICAgIC0gbGVubnkuY2hhb3M6OTEwMAogICAgLSByaW90MDEuY2hhb3M6OTEwMAogICAgLSB0cnVoZTo5MTAwCiAgICAtIHR1bW9yLmNoYW9zOjkxMDAKICAgIC0gd29obno6OTEwMAogICAgLSB5b3JpLmNoYW9zOjkxMDAK + prometheus-additional.yaml: LSBqb2JfbmFtZTogbXlzcWxkCiAgc3RhdGljX2NvbmZpZ3M6CiAgLSB0YXJnZXRzOgogICAgLSBtYXJpYWRiLmxhbjo5MTA0Ci0gam9iX25hbWU6IG1xdHQubW9zcXVpdHRvCiAgc3RhdGljX2NvbmZpZ3M6CiAgLSB0YXJnZXRzOgogICAgLSBtcXR0Lmxhbjo5MjM0Ci0gam9iX25hbWU6IGhhcHJveHkKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGRydWNraS53a3M6OTEwMQogICAgLSByaW90MDEuY2hhb3M6OTEwMQogICAgLSBhdXRvOjkxMDEKLSBqb2JfbmFtZToga2xpcHBlcgogIHN0YXRpY19jb25maWdzOgogIC0gdGFyZ2V0czoKICAgIC0gZHJ1Y2tpLndrczozOTAzCi0gam9iX25hbWU6IG9jdG9wcmludAogIG1ldHJpY3NfcGF0aDogL3BsdWdpbi9wcm9tZXRoZXVzX2V4cG9ydGVyL21ldHJpY3MKICBwYXJhbXM6CiAgICBhcGlrZXk6CiAgICAtIDMwRThCMDFCRkQ2NzRFNUJCRDQ0NkQwOEM0NzMwREY0CiAgc3RhdGljX2NvbmZpZ3M6CiAgLSB0YXJnZXRzOgogICAgLSBkcnVja2kud2tzOjgwCi0gam9iX25hbWU6IG9wZW5oYWIyCiAgbWV0cmljc19wYXRoOiAvCiAgc3RhdGljX2NvbmZpZ3M6CiAgLSB0YXJnZXRzOgogICAgLSBhdXRvLmNoYW9zOjk5OTkKLSBqb2JfbmFtZTogbm9kZQogIHN0YXRpY19jb25maWdzOgogIC0gdGFyZ2V0czoKICAgIC0gZHVtb250LmNoYW9zOjkxMDAKICAgIC0gZHVtb250Lndrczo5MTAwCiAgICAtIGF1dG8wMTo5MTAwCiAgICAtIGRydWNraS53a3M6OTEwMAogICAgLSBlYmluMDEuY2hhb3M6OTEwMAogICAgLSBlYmluMDIuY2hhb3M6OTEwMAogICAgLSByaW90MDEuY2hhb3M6OTEwMAogICAgLSB0cnVoZTo5MTAwCiAgICAtIHR1bW9yLmNoYW9zOjkxMDAKICAgIC0gd29obno6OTEwMAogICAgLSB5b3JpLmNoYW9zOjkxMDAK kind: Secret metadata: creationTimestamp: null diff --git a/prometheus/prometheus-additional.yaml b/prometheus/prometheus-additional.yaml index a84717a..4edef8c 100644 --- a/prometheus/prometheus-additional.yaml +++ b/prometheus/prometheus-additional.yaml @@ -9,13 +9,13 @@ - job_name: haproxy static_configs: - targets: - - drucki.chaos:9101 + - drucki.wks:9101 - riot01.chaos:9101 - auto:9101 - job_name: klipper static_configs: - targets: - - drucki.chaos:3903 + - drucki.wks:3903 - job_name: octoprint metrics_path: /plugin/prometheus_exporter/metrics params: @@ -23,7 +23,7 @@ - 30E8B01BFD674E5BBD446D08C4730DF4 static_configs: - targets: - - drucki.chaos:80 + - drucki.wks:80 - job_name: openhab2 metrics_path: / static_configs: @@ -33,11 +33,11 @@ static_configs: - targets: - dumont.chaos:9100 + - dumont.wks:9100 - auto01:9100 - - drucki.chaos:9100 + - drucki.wks:9100 - ebin01.chaos:9100 - ebin02.chaos:9100 - - lenny.chaos:9100 - riot01.chaos:9100 - truhe:9100 - tumor.chaos:9100