From f616346ac67d8f82fa9bf002fe491e310e53f28e Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Tue, 9 Feb 2021 20:26:53 +0100 Subject: [PATCH] sweet caroline --- apps/smarthome/home-assistant.yaml | 25 ++++++++++++++++--- apps/web/piwigo/deployment.yaml | 3 +-- .../additional-scrape-configs.yaml | 2 +- .../prometheus-additional.yaml | 20 +++++++-------- 4 files changed, 33 insertions(+), 17 deletions(-) diff --git a/apps/smarthome/home-assistant.yaml b/apps/smarthome/home-assistant.yaml index c1b181d..ae7928a 100644 --- a/apps/smarthome/home-assistant.yaml +++ b/apps/smarthome/home-assistant.yaml @@ -19,8 +19,7 @@ spec: spec: containers: - name: hassio - image: "homeassistant/home-assistant:stable" - #image: "homeassistant/aarch64-hassio-supervisor:latest" + image: "homeassistant/home-assistant:latest" imagePullPolicy: Always env: - name: TZ @@ -36,11 +35,14 @@ spec: httpGet: path: / port: http -# resources: + initialDelaySeconds: 60 + periodSeconds: 10 readinessProbe: httpGet: path: / port: http + initialDelaySeconds: 60 + periodSeconds: 5 # requests: # memory: "256Mi" # cpu: "250m" @@ -50,10 +52,27 @@ spec: - name: configurator image: "causticlab/hass-configurator-docker:arm" imagePullPolicy: Always + env: + - name: HC_HASS_API + value: http://127.0.0.1:8123/api/ + - name: HC_HASS_API_PASSWORD + value: eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJhMzBmYjU1ZjcyZGE0Yzc2YmU2NmY0NjljNTAyMjdjZCIsImlhdCI6MTYxMjg4MzI5NywiZXhwIjoxOTI4MjQzMjk3fQ.1ICsHliUXR0CG4H8vQRYJ5jVqFwmqKSB0fScSitC-Q4 ports: - name: adm containerPort: 3218 protocol: TCP + livenessProbe: + httpGet: + path: / + port: 3218 + initialDelaySeconds: 3 + periodSeconds: 3 + readinessProbe: + httpGet: + path: / + port: 3218 + initialDelaySeconds: 10 + periodSeconds: 5 volumeMounts: - name: hassio-storage mountPath: /hass-config diff --git a/apps/web/piwigo/deployment.yaml b/apps/web/piwigo/deployment.yaml index 5c22202..e2a761a 100644 --- a/apps/web/piwigo/deployment.yaml +++ b/apps/web/piwigo/deployment.yaml @@ -17,9 +17,8 @@ spec: app: piwigo spec: containers: - - image: linuxserver/piwigo + - image: linuxserver/piwigo:latest name: piwigo - imagePullPolicy: IfNotPresent env: # Use secret in real usage - name: TZ diff --git a/cluster-monitoring-local/additional-scrape-configs.yaml b/cluster-monitoring-local/additional-scrape-configs.yaml index d4222e7..9820c03 100644 --- a/cluster-monitoring-local/additional-scrape-configs.yaml +++ b/cluster-monitoring-local/additional-scrape-configs.yaml @@ -1,6 +1,6 @@ apiVersion: v1 data: - prometheus-additional.yaml: LSBqb2JfbmFtZTogZ2l0ZWEKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGdpdC11aS5sYW4KLSBqb2JfbmFtZTogbmdpbngKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGF1dG8uY2hhb3M6OTExMwotIGpvYl9uYW1lOiBteXNxbGQKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIG1hcmlhZGIubGFuOjkxMDQKLSBqb2JfbmFtZTogbXF0dC5tb3NxdWl0dG8KICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIG1xdHQubGFuOjkyMzQKLSBqb2JfbmFtZTogaGFwcm94eQogIHN0YXRpY19jb25maWdzOgogIC0gdGFyZ2V0czoKICAgIC0gZHJ1Y2tpLndrczo5MTAxCi0gam9iX25hbWU6IGtsaXBwZXIKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGRydWNraS53a3M6MzkwMwotIGpvYl9uYW1lOiBvY3RvcHJpbnQKICBtZXRyaWNzX3BhdGg6IC9wbHVnaW4vcHJvbWV0aGV1c19leHBvcnRlci9tZXRyaWNzCiAgcGFyYW1zOgogICAgYXBpa2V5OgogICAgLSAzMEU4QjAxQkZENjc0RTVCQkQ0NDZEMDhDNDczMERGNAogIHN0YXRpY19jb25maWdzOgogIC0gdGFyZ2V0czoKICAgIC0gZHJ1Y2tpLndrczo4MAotIGpvYl9uYW1lOiBvcGVuaGFiMgogIG1ldHJpY3NfcGF0aDogLwogIHN0YXRpY19jb25maWdzOgogIC0gdGFyZ2V0czoKICAgIC0gYXV0by5jaGFvczo5OTk5Ci0gam9iX25hbWU6IGhhc3NpbwogIG1ldHJpY3NfcGF0aDogL2FwaS9wcm9tZXRoZXVzCiAgYmVhcmVyX3Rva2VuOiAnZXlKMGVYQWlPaUpLVjFRaUxDSmhiR2NpT2lKSVV6STFOaUo5LmV5SnBjM01pT2lJM05EUm1aV1EzT0ROak5UVTBaRE0xWWpoaVlUWmpNV0ppTjJJeFl6TTNOQ0lzSW1saGRDSTZNVFl4TVRNd05EQXhOaXdpWlhod0lqb3hPVEkyTmpZME1ERTJmUS4wV1B5eHM4N192cXZhNi1LRDBPd0F3TTdXS3RXeGhmbGFRMnBGeWtUNmMwJwogIHN0YXRpY19jb25maWdzOgogICAgLSB0YXJnZXRzOgogICAgICAtIGhhc3Npby5sYW46ODAKLSBqb2JfbmFtZTogbm9kZQogIHN0YXRpY19jb25maWdzOgogIC0gdGFyZ2V0czoKICAgIC0gYWRtMDEud2tzOjkxMDAKICAgIC0gZHVtb250Lndrczo5MTAwCiAgICAtIGRydWNraS53a3M6OTEwMAogICAgLSBlYmluMDEud2tzOjkxMDAKICAgIC0gZWJpbjAyLndrczo5MTAwCiAgICAtIHJpb3QwMS53a3M6OTEwMAogICAgLSB0cnVoZS5jaGFvczo5MTAwCiAgICAtIGF1dG8wMS5jaGFvczo5MTAwCiAgICAtIGR1bW9udC5jaGFvczo5MTAwCiAgICAtIHR1bW9yLmNoYW9zOjkxMDAKICAgIC0gd29obnouY2hhb3M6OTEwMAogICAgLSB5b3JpLmNoYW9zOjkxMDAK + prometheus-additional.yaml: LSBqb2JfbmFtZTogZ2l0ZWEKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGdpdC11aS5sYW4KLSBqb2JfbmFtZTogbXlzcWxkCiAgc3RhdGljX2NvbmZpZ3M6CiAgLSB0YXJnZXRzOgogICAgLSBtYXJpYWRiLmxhbjo5MTA0Ci0gam9iX25hbWU6IG1xdHQubW9zcXVpdHRvCiAgc3RhdGljX2NvbmZpZ3M6CiAgLSB0YXJnZXRzOgogICAgLSBtcXR0Lmxhbjo5MjM0Ci0gam9iX25hbWU6IGhhcHJveHkKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGRydWNraS53a3M6OTEwMQogICAgLSBhdXRvMDIuY2hhb3M6OTEwMQotIGpvYl9uYW1lOiBrbGlwcGVyCiAgc3RhdGljX2NvbmZpZ3M6CiAgLSB0YXJnZXRzOgogICAgLSBkcnVja2kud2tzOjM5MDMKLSBqb2JfbmFtZTogb2N0b3ByaW50CiAgbWV0cmljc19wYXRoOiAvcGx1Z2luL3Byb21ldGhldXNfZXhwb3J0ZXIvbWV0cmljcwogIHBhcmFtczoKICAgIGFwaWtleToKICAgIC0gMzBFOEIwMUJGRDY3NEU1QkJENDQ2RDA4QzQ3MzBERjQKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGRydWNraS53a3M6ODAKLSBqb2JfbmFtZTogaGFzc2lvCiAgbWV0cmljc19wYXRoOiAvYXBpL3Byb21ldGhldXMKICBiZWFyZXJfdG9rZW46ICdleUowZVhBaU9pSktWMVFpTENKaGJHY2lPaUpJVXpJMU5pSjkuZXlKcGMzTWlPaUpoTXpCbVlqVTFaamN5WkdFMFl6YzJZbVUyTm1ZME5qbGpOVEF5TWpkalpDSXNJbWxoZENJNk1UWXhNamc0TXpJNU55d2laWGh3SWpveE9USTRNalF6TWprM2ZRLjFJQ3NIbGlVWFIwQ0c0SDh2UVJZSjVqVnFGd21xS1NCMGZTY1NpdEMtUTQnCiAgc3RhdGljX2NvbmZpZ3M6CiAgICAtIHRhcmdldHM6CiAgICAgIC0gaGFzc2lvLmxhbjo4MAotIGpvYl9uYW1lOiBoYXNzaW9fcmluZzg2CiAgbWV0cmljc19wYXRoOiAvYXBpL3Byb21ldGhldXMKICBiZWFyZXJfdG9rZW46ICdleUowZVhBaU9pSktWMVFpTENKaGJHY2lPaUpJVXpJMU5pSjkuZXlKcGMzTWlPaUkwT0dGalpUSmlObVEzT1RnME1qYzNZV0ZtTW1ObVptVTFZemM0TlRFME5DSXNJbWxoZENJNk1UWXhNakU1TWprME1Dd2laWGh3SWpveE9USTNOVFV5T1RRd2ZRLkJiSUFYbTlScTBqYjZvdXFnVkhOZDZLZWV6M05QM3loLTd3eWZ1b0I4WWsnCiAgc3RhdGljX2NvbmZpZ3M6CiAgICAtIHRhcmdldHM6CiAgICAgIC0gYXV0by5jaGFvczo4MAotIGpvYl9uYW1lOiBub2RlCiAgc3RhdGljX2NvbmZpZ3M6CiAgLSB0YXJnZXRzOgogICAgLSBhZG0wMS53a3M6OTEwMAogICAgLSBkdW1vbnQud2tzOjkxMDAKICAgIC0gZHJ1Y2tpLndrczo5MTAwCiAgICAtIGViaW4wMS53a3M6OTEwMAogICAgLSBlYmluMDIud2tzOjkxMDAKICAgIC0gcmlvdDAxLndrczo5MTAwCiAgICAtIHRydWhlLmNoYW9zOjkxMDAKICAgIC0gYXV0bzAxLmNoYW9zOjkxMDAKICAgIC0gYXV0bzAyLmNoYW9zOjkxMDAKICAgIC0gZHVtb250LmNoYW9zOjkxMDAKICAgIC0gdHVtb3IuY2hhb3M6OTEwMAogICAgLSB3b2huei5jaGFvczo5MTAwCg== kind: Secret metadata: creationTimestamp: null diff --git a/cluster-monitoring-local/prometheus-additional.yaml b/cluster-monitoring-local/prometheus-additional.yaml index c35832c..e941ce9 100644 --- a/cluster-monitoring-local/prometheus-additional.yaml +++ b/cluster-monitoring-local/prometheus-additional.yaml @@ -2,10 +2,6 @@ static_configs: - targets: - git-ui.lan -- job_name: nginx - static_configs: - - targets: - - auto.chaos:9113 - job_name: mysqld static_configs: - targets: @@ -18,6 +14,7 @@ static_configs: - targets: - drucki.wks:9101 + - auto02.chaos:9101 - job_name: klipper static_configs: - targets: @@ -30,17 +27,18 @@ static_configs: - targets: - drucki.wks:80 -- job_name: openhab2 - metrics_path: / - static_configs: - - targets: - - auto.chaos:9999 - job_name: hassio metrics_path: /api/prometheus - bearer_token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiI3NDRmZWQ3ODNjNTU0ZDM1YjhiYTZjMWJiN2IxYzM3NCIsImlhdCI6MTYxMTMwNDAxNiwiZXhwIjoxOTI2NjY0MDE2fQ.0WPyxs87_vqva6-KD0OwAwM7WKtWxhflaQ2pFykT6c0' + bearer_token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJhMzBmYjU1ZjcyZGE0Yzc2YmU2NmY0NjljNTAyMjdjZCIsImlhdCI6MTYxMjg4MzI5NywiZXhwIjoxOTI4MjQzMjk3fQ.1ICsHliUXR0CG4H8vQRYJ5jVqFwmqKSB0fScSitC-Q4' static_configs: - targets: - hassio.lan:80 +- job_name: hassio_ring86 + metrics_path: /api/prometheus + bearer_token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiI0OGFjZTJiNmQ3OTg0Mjc3YWFmMmNmZmU1Yzc4NTE0NCIsImlhdCI6MTYxMjE5Mjk0MCwiZXhwIjoxOTI3NTUyOTQwfQ.BbIAXm9Rq0jb6ouqgVHNd6Keez3NP3yh-7wyfuoB8Yk' + static_configs: + - targets: + - auto.chaos:80 - job_name: node static_configs: - targets: @@ -52,7 +50,7 @@ - riot01.wks:9100 - truhe.chaos:9100 - auto01.chaos:9100 + - auto02.chaos:9100 - dumont.chaos:9100 - tumor.chaos:9100 - wohnz.chaos:9100 - - yori.chaos:9100