From e4a93204c9046994c8b8d4429d413596495c9cee Mon Sep 17 00:00:00 2001 From: Massaki Archambault Date: Fri, 10 Sep 2021 23:30:38 -0400 Subject: [PATCH] tweak blackbox-exporter, ajust request/limits --- .../blackbox-exporter-deployment.yaml | 30 +++++++++++-------- .../bases/grafana/grafana-deployment.yaml | 8 +++-- .../bases/nextcloud/nextcloud-deployment.yaml | 4 +-- .../bases/postgres/postgres-statefulset.yaml | 6 ++-- .../monitoring/probes/blackbox-exporter.yaml | 2 +- kustomize/overlays/dev/kustomization.yaml | 7 +++-- kustomize/overlays/prod/kustomization.yaml | 7 +++-- .../blackbox-exporter-bobcat-miner.yaml | 11 ------- kustomize/overlays/prod/placeholders.txt | 2 +- .../external-services-bobcat-miner.yaml | 6 ++-- 10 files changed, 43 insertions(+), 40 deletions(-) delete mode 100644 kustomize/overlays/prod/patches/blackbox-exporter-bobcat-miner.yaml diff --git a/kustomize/bases/blackbox-exporter/blackbox-exporter-deployment.yaml b/kustomize/bases/blackbox-exporter/blackbox-exporter-deployment.yaml index 44c3ec0..4fe406e 100644 --- a/kustomize/bases/blackbox-exporter/blackbox-exporter-deployment.yaml +++ b/kustomize/bases/blackbox-exporter/blackbox-exporter-deployment.yaml @@ -11,19 +11,23 @@ spec: labels: app.kubernetes.io/name: blackbox-exporter spec: + securityContext: + sysctls: + - name: net.ipv4.ping_group_range + value: "0 2147483647" containers: - - name: blackbox-exporter - image: prom/blackbox-exporter - resources: - requests: - memory: 128Mi - cpu: 500m - limits: - memory: 128Mi - cpu: 500m - ports: - - containerPort: 9115 - name: http-metrics + - name: blackbox-exporter + image: prom/blackbox-exporter + resources: + requests: + memory: 128Mi + cpu: 100m + limits: + memory: 128Mi + cpu: 500m + ports: + - containerPort: 9115 + name: http-metrics --- apiVersion: v1 kind: Service @@ -37,4 +41,4 @@ spec: ports: - name: http-metrics port: 9115 - targetPort: http-metrics \ No newline at end of file + targetPort: http-metrics diff --git a/kustomize/bases/grafana/grafana-deployment.yaml b/kustomize/bases/grafana/grafana-deployment.yaml index 7e0cdae..250b3c9 100644 --- a/kustomize/bases/grafana/grafana-deployment.yaml +++ b/kustomize/bases/grafana/grafana-deployment.yaml @@ -27,10 +27,14 @@ spec: - name: grafana image: grafana/grafana env: - - name: GF_AUTH_ANONYMOUS_ENABLED - value: "true" + - name: GF_SERVER_DOMAIN + value: ${GRAFANA_EXTERNAL_HOST} + # - name: GF_AUTH_ANONYMOUS_ENABLED + # value: "true" - name: GF_INSTALL_PLUGINS value: marcusolsson-json-datasource,marcusolsson-treemap-panel + - name: GF_FEATURE_TOGGLES_ENABLE + value: ngalert readinessProbe: failureThreshold: 3 httpGet: diff --git a/kustomize/bases/nextcloud/nextcloud-deployment.yaml b/kustomize/bases/nextcloud/nextcloud-deployment.yaml index 6aca935..8652a5b 100644 --- a/kustomize/bases/nextcloud/nextcloud-deployment.yaml +++ b/kustomize/bases/nextcloud/nextcloud-deployment.yaml @@ -66,10 +66,10 @@ spec: containerPort: 80 resources: requests: - cpu: 1500m + cpu: 2000m memory: 1Gi limits: - cpu: 2000m + cpu: 4000m memory: 1.5Gi volumeMounts: - name: nextcloud-pv diff --git a/kustomize/bases/postgres/postgres-statefulset.yaml b/kustomize/bases/postgres/postgres-statefulset.yaml index 5a746a7..a1840d7 100644 --- a/kustomize/bases/postgres/postgres-statefulset.yaml +++ b/kustomize/bases/postgres/postgres-statefulset.yaml @@ -41,11 +41,11 @@ spec: containerPort: 5432 resources: requests: - cpu: 1000m + cpu: 500m memory: 1Gi limits: - cpu: 1500m - memory: 2Gi + cpu: 1000m + memory: 1Gi volumeMounts: - name: postgres-pvc mountPath: /data diff --git a/kustomize/namespaces/monitoring/probes/blackbox-exporter.yaml b/kustomize/namespaces/monitoring/probes/blackbox-exporter.yaml index aa2938c..6829180 100644 --- a/kustomize/namespaces/monitoring/probes/blackbox-exporter.yaml +++ b/kustomize/namespaces/monitoring/probes/blackbox-exporter.yaml @@ -19,4 +19,4 @@ spec: relabelingConfigs: - action: replace sourceLabels: [__meta_kubernetes_ingress_label_app_kubernetes_io_name] - targetLabel: name + targetLabel: service diff --git a/kustomize/overlays/dev/kustomization.yaml b/kustomize/overlays/dev/kustomization.yaml index e1151c8..73f36f1 100644 --- a/kustomize/overlays/dev/kustomization.yaml +++ b/kustomize/overlays/dev/kustomization.yaml @@ -8,10 +8,13 @@ bases: images: - name: gitea/gitea newTag: 1.15.0 - - name: grafana - newTag: 8.1.2 + - name: grafana/grafana + newTag: 8.1.3 - name: prom/node-exporter newTag: v0.18.1 + - name: prom/blackbox-exporter + newName: badjware/blackbox-exporter-tweak + newTag: 0.19.0-1 - name: drone/drone newTag: 2.0.6 - name: drone/drone-runner-kube diff --git a/kustomize/overlays/prod/kustomization.yaml b/kustomize/overlays/prod/kustomization.yaml index 1d2eeb3..8db71a5 100644 --- a/kustomize/overlays/prod/kustomization.yaml +++ b/kustomize/overlays/prod/kustomization.yaml @@ -11,10 +11,13 @@ resources: images: - name: gitea/gitea newTag: 1.15.0 - - name: grafana - newTag: 8.1.2 + - name: grafana/grafana + newTag: 8.1.3 - name: prom/node-exporter newTag: v0.18.1 + - name: prom/blackbox-exporter + newName: badjware/blackbox-exporter-tweak + newTag: 0.19.0-1 - name: drone/drone newTag: 2.0.6 - name: drone/drone-runner-kube diff --git a/kustomize/overlays/prod/patches/blackbox-exporter-bobcat-miner.yaml b/kustomize/overlays/prod/patches/blackbox-exporter-bobcat-miner.yaml deleted file mode 100644 index 1fcd076..0000000 --- a/kustomize/overlays/prod/patches/blackbox-exporter-bobcat-miner.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: Probe -metadata: - name: blackbox-exporter -spec: - targets: - staticConfig: - static: - - http://192.168.40.30/ - labels: - name: bobcat-miner \ No newline at end of file diff --git a/kustomize/overlays/prod/placeholders.txt b/kustomize/overlays/prod/placeholders.txt index e8f0506..6efe037 100644 --- a/kustomize/overlays/prod/placeholders.txt +++ b/kustomize/overlays/prod/placeholders.txt @@ -2,6 +2,6 @@ GITEA_EXTERNAL_HOST=code.badjware.dev DRONE_EXTERNAL_HOST=drone.badjware.dev NEXTCLOUD_EXTERNAL_HOST=cloud.badjware.dev -GRAFANA_EXTERNAL_HOST=grafana.badjnet.home +GRAFANA_EXTERNAL_HOST=grafana.badjware.dev KUBERNETES_DASHBOARD_EXTERNAL_HOST=kubernetes-dashboard.badjnet.home PROMETHEUS_EXTERNAL_HOST=prometheus.badjnet.home diff --git a/kustomize/overlays/prod/probes/external-services-bobcat-miner.yaml b/kustomize/overlays/prod/probes/external-services-bobcat-miner.yaml index 964c982..4f35e03 100644 --- a/kustomize/overlays/prod/probes/external-services-bobcat-miner.yaml +++ b/kustomize/overlays/prod/probes/external-services-bobcat-miner.yaml @@ -7,12 +7,12 @@ metadata: monitor: prometheus namespace: monitoring spec: - module: http_2xx + module: icmp prober: url: blackbox-exporter.monitoring.svc:9115 targets: staticConfig: static: - - http://192.168.40.30/ + - 192.168.40.30 labels: - name: bobcat-miner + service: bobcat-miner