From 4b480491a15dca495f3283c2d7399b68bf9b931e Mon Sep 17 00:00:00 2001 From: Rob Watson Date: Sun, 5 Jun 2022 18:04:54 +0200 Subject: [PATCH] synapse: Add metrics integrations --- deploy/base/inflated/grafana/templates/configmap.yaml | 2 +- deploy/base/inflated/grafana/templates/deployment.yaml | 2 +- deploy/base/statefulset-synapse.yaml | 4 ++++ deploy/base/values/grafana.yaml | 4 ++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/deploy/base/inflated/grafana/templates/configmap.yaml b/deploy/base/inflated/grafana/templates/configmap.yaml index 0496497..84a49c6 100644 --- a/deploy/base/inflated/grafana/templates/configmap.yaml +++ b/deploy/base/inflated/grafana/templates/configmap.yaml @@ -53,7 +53,7 @@ data: --max-time 60 \ -H "Accept: application/json" \ -H "Content-Type: application/json;charset=UTF-8" \ - "https://grafana.com/api/dashboards/13192/revisions/1/download" | sed '/-- .* --/! s/"datasource":.*,/"datasource": "Prometheus",/g'\ + "https://grafana.com/api/dashboards/10046/revisions/1/download" | sed '/-- .* --/! s/"datasource":.*,/"datasource": "Prometheus",/g'\ > "/var/lib/grafana/dashboards/default/gitea.json" curl -skf \ --connect-timeout 60 \ diff --git a/deploy/base/inflated/grafana/templates/deployment.yaml b/deploy/base/inflated/grafana/templates/deployment.yaml index db1c1eb..eeea176 100644 --- a/deploy/base/inflated/grafana/templates/deployment.yaml +++ b/deploy/base/inflated/grafana/templates/deployment.yaml @@ -26,7 +26,7 @@ spec: app.kubernetes.io/name: grafana app.kubernetes.io/instance: grafana annotations: - checksum/config: da84e3fbedccb40edb325ecae9c60acd826813da426696f663f3ad0ac42d3275 + checksum/config: 6060638a52f08e279c64b37a63b59ec99aa0b12a2a25e594b3d7acd41512ea01 checksum/dashboards-json-config: 60bfce132b37398fa9329494762f049aebef4ba473dabdd67d4f15d6a86a578c checksum/sc-dashboard-provider-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b spec: diff --git a/deploy/base/statefulset-synapse.yaml b/deploy/base/statefulset-synapse.yaml index 8b3dda1..daf5d99 100644 --- a/deploy/base/statefulset-synapse.yaml +++ b/deploy/base/statefulset-synapse.yaml @@ -20,6 +20,10 @@ spec: component: web app.kubernetes.io/name: synapse app.kubernetes.io/instance: synapse + annotations: + prometheus.io/port: "9000" + prometheus.io/scrape: "true" + prometheus.io/path: /_synapse/metrics spec: securityContext: fsGroup: 991 diff --git a/deploy/base/values/grafana.yaml b/deploy/base/values/grafana.yaml index 16c0983..418f92f 100644 --- a/deploy/base/values/grafana.yaml +++ b/deploy/base/values/grafana.yaml @@ -50,3 +50,7 @@ dashboards: gnetId: 13192 revision: 1 datasource: Prometheus + gitea: + gnetId: 10046 + revision: 1 + datasource: Prometheus