Remove old Helm chart templates and Grafana dashboards

Signed-off-by: Johann Hoffmann <johann.hoffmann@mailbox.org>
This commit is contained in:
Johann Hoffmann
2022-04-08 19:30:41 +02:00
parent c208cd7c34
commit 3526e534ab
8 changed files with 1 additions and 3845 deletions

View File

@@ -1,48 +0,0 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: mosquitto-exporter
namespace: {{ .Values.monitoring.namespace }}
labels:
app: mosquitto-exporter
release: tip
spec:
selector:
matchLabels:
app: mosquitto-exporter
release: tip
template:
metadata:
labels:
app: mosquitto-exporter
release: tip
spec:
containers:
- args:
- "--endpoint"
- "tls://{{ .Values.target.service.name }}.{{ .Values.target.namespace }}.svc.cluster.local:{{ .Values.target.service.port }}"
- "--bind-address"
- "0.0.0.0:9234"
- "--cert"
- "/certs/clientcert.pem"
- "--key"
- "/certs/clientkey.pem"
command:
- /mosquitto_exporter
name: mosquitto-exporter
image: {{ .Values.image.name }}:{{ .Values.image.tag }}
ports:
- name: http-metrics
containerPort: 9234
volumeMounts:
- mountPath: /certs/clientcert.pem
name: opensync-mqtt-broker-truststore
subPath: clientcert.pem
- mountPath: /certs/clientkey.pem
name: opensync-mqtt-broker-truststore
subPath: clientkey_dec.pem
volumes:
- name: opensync-mqtt-broker-truststore
secret:
defaultMode: 420
secretName: opensync-mqtt-broker-certs

View File

@@ -1,11 +0,0 @@
# certs are generated in the wlan-pki-cert-scripts repo
# following are required: cacert.pem, clientcert.pem and clientkey_dec.pem
---
apiVersion: v1
kind: Secret
metadata:
name: opensync-mqtt-broker-certs
namespace: {{ .Values.monitoring.namespace }}
type: Opaque
data:
{{ tpl (.Files.Glob "mqtt-certs/*").AsSecrets . | indent 2 }}

View File

@@ -1,37 +0,0 @@
# not needed with the latest postgresql version
# ---
# apiVersion: monitoring.coreos.com/v1
# kind: PodMonitor
# metadata:
# name: postgres-exporter
# namespace: {{ .Values.monitoring.namespace }}
# labels:
# release: prometheus-operator
# spec:
# selector:
# matchLabels:
# app: postgresql
# release: tip
# podMetricsEndpoints:
# - port: http-metrics
# namespaceSelector:
# any: true
---
apiVersion: monitoring.coreos.com/v1
kind: PodMonitor
metadata:
name: mosquitto-exporter
namespace: {{ .Values.monitoring.namespace }}
labels:
release: prometheus-operator
spec:
selector:
matchLabels:
app: mosquitto-exporter
release: tip
podMetricsEndpoints:
- port: http-metrics
namespaceSelector:
any: true

View File

@@ -1,12 +1,2 @@
image:
name: sapcc/mosquitto-exporter
tag: "0.6.0"
target:
namespace: tip
service:
name: tip-opensync-mqtt-broker
port: "1883"
monitoring:
namespace: monitoring
namespace: monitoring

File diff suppressed because it is too large Load Diff

View File

@@ -1,382 +0,0 @@
{
"__inputs": [
{
"name": "DS_PROMETHEUS",
"label": "Prometheus",
"description": "",
"type": "datasource",
"pluginId": "prometheus",
"pluginName": "Prometheus"
}
],
"__requires": [
{
"type": "grafana",
"id": "grafana",
"name": "Grafana",
"version": "7.4.2"
},
{
"type": "panel",
"id": "graph",
"name": "Graph",
"version": ""
},
{
"type": "datasource",
"id": "prometheus",
"name": "Prometheus",
"version": "1.0.0"
},
{
"type": "panel",
"id": "table",
"name": "Table",
"version": ""
}
],
"annotations": {
"list": [
{
"builtIn": 1,
"datasource": "-- Grafana --",
"enable": true,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
"name": "Annotations & Alerts",
"type": "dashboard"
}
]
},
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"id": null,
"links": [],
"panels": [
{
"alert": {
"alertRuleTags": {},
"conditions": [
{
"evaluator": {
"params": [
0
],
"type": "gt"
},
"operator": {
"type": "and"
},
"query": {
"params": [
"Number of waiting containers",
"5m",
"now"
]
},
"reducer": {
"params": [],
"type": "avg"
},
"type": "query"
}
],
"executionErrorState": "alerting",
"for": "5m",
"frequency": "1m",
"handler": 1,
"name": "Number of waiting pods alert",
"noDataState": "no_data",
"notifications": []
},
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "Prometheus",
"fieldConfig": {
"defaults": {
"custom": {}
},
"overrides": []
},
"fill": 1,
"fillGradient": 0,
"gridPos": {
"h": 8,
"w": 12,
"x": 0,
"y": 0
},
"hiddenSeries": false,
"id": 2,
"legend": {
"avg": false,
"current": false,
"hideEmpty": false,
"hideZero": false,
"max": false,
"min": false,
"show": false,
"total": false,
"values": false
},
"lines": true,
"linewidth": 1,
"nullPointMode": "null",
"options": {
"alertThreshold": true
},
"percentage": false,
"pluginVersion": "7.4.2",
"pointradius": 2,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"expr": "sum(kube_pod_container_status_waiting_reason{namespace=~\".*nola.*\", reason!=\"ContainerCreating\"}) by (namespace) + sum(kube_pod_init_container_status_waiting_reason{namespace=~\".*nola.*\", reason!=\"ContainerCreating\"}) by (namespace)",
"hide": false,
"interval": "",
"legendFormat": "{{namespace}}",
"refId": "Number of waiting containers"
}
],
"thresholds": [
{
"colorMode": "critical",
"fill": true,
"line": true,
"op": "gt",
"value": 0,
"visible": true
}
],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Number of waiting pods",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"$$hashKey": "object:65",
"decimals": 0,
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": "0",
"show": true
},
{
"$$hashKey": "object:66",
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {},
"bars": true,
"dashLength": 10,
"dashes": false,
"datasource": "Prometheus",
"fieldConfig": {
"defaults": {
"custom": {}
},
"overrides": []
},
"fill": 1,
"fillGradient": 0,
"gridPos": {
"h": 8,
"w": 12,
"x": 12,
"y": 0
},
"hiddenSeries": false,
"id": 6,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": false,
"total": false,
"values": false
},
"lines": false,
"linewidth": 1,
"nullPointMode": "null",
"options": {
"alertThreshold": true
},
"percentage": false,
"pluginVersion": "7.4.2",
"pointradius": 2,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": true,
"steppedLine": false,
"targets": [
{
"expr": "sum(changes(kube_pod_container_status_restarts_total{namespace=~\".*nola.*\"}[1m])) by (namespace) + sum(changes(kube_pod_init_container_status_restarts_total{namespace=~\".*nola.*\"}[1m])) by (namespace)",
"hide": false,
"interval": "",
"intervalFactor": 1,
"legendFormat": "{{namespace}}",
"refId": "A"
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Pod restarts",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"$$hashKey": "object:70",
"decimals": 0,
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": "0",
"show": true
},
{
"$$hashKey": "object:71",
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": false
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"datasource": "Prometheus",
"fieldConfig": {
"defaults": {
"color": {
"mode": "thresholds"
},
"custom": {
"align": null,
"filterable": true
},
"mappings": [],
"thresholds": {
"mode": "absolute",
"steps": []
}
},
"overrides": []
},
"gridPos": {
"h": 9,
"w": 24,
"x": 0,
"y": 8
},
"id": 4,
"options": {
"showHeader": true,
"sortBy": [
{
"desc": true,
"displayName": "Time"
}
]
},
"pluginVersion": "7.4.2",
"targets": [
{
"expr": "sum(kube_pod_container_status_waiting_reason{namespace=~\".*nola.*\", reason!=\"ContainerCreating\"}) by (namespace, pod, reason) > 0",
"format": "table",
"interval": "",
"intervalFactor": 1,
"legendFormat": "",
"refId": "A"
}
],
"timeFrom": null,
"timeShift": null,
"title": "Waiting pods",
"transformations": [
{
"id": "organize",
"options": {
"excludeByName": {
"Value": true
},
"indexByName": {},
"renameByName": {}
}
}
],
"type": "table"
}
],
"refresh": false,
"schemaVersion": 27,
"style": "dark",
"tags": [],
"templating": {
"list": []
},
"time": {
"from": "now-1h",
"to": "now"
},
"timepicker": {},
"timezone": "",
"title": "NOLA Testbeds Pod Events",
"uid": "oiygS_yGk",
"version": 8
}

View File

@@ -319,44 +319,6 @@ releases:
editable: true
options:
path: /var/lib/grafana/dashboards/default
dashboards:
default:
mosquitto:
gnetId: 11542
revision: 1
datasource: Prometheus
nginx-ingress:
gnetId: 9614
revision: 1
datasource: Prometheus
postgres:
gnetId: 6742
revision: 1
datasource: Prometheus
# still need to finalize the dashboards below but they are working partially
cassandra:
# gnetId: 5408
gnetId: 6258
revision: 3
datasource: Prometheus
kafka:
gnetId: 7589
revision: 5
# gnetId: 10555
# revision: 1
datasource: Prometheus
jvm-metrics-per-pod:
datasource: Prometheus
json: |
{{- readFile "grafana-dashboards/jvm-metrics-per-pod.json" | nindent 14 }}
cloud-controller-perf:
datasource: Prometheus
json: |
{{- readFile "grafana-dashboards/cloud-controller-perf.json" | nindent 14 }}
pod-events:
datasource: Prometheus
json: |
{{- readFile "grafana-dashboards/pod-events.json" | nindent 14 }}
datasources:
datasources.yaml: