DevOps/truecharts
2
0
Fork 0
Code Issues Pull Requests Actions 28 Packages Projects Releases 1 Wiki Activity

fix(apps): change some common references to tc.common (#3019)

Browse Source
This commit is contained in:
Stavros Kois
2022-06-30 10:48:43 +02:00
committed by GitHub
parent d3923bb65c
commit b356c7f740
19 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/dependency/promtail/Chart.yaml
+1 -1
View File
@@ -22,7 +22,7 @@ sources:
- https://grafana.com/oss/loki/ - https://grafana.com/oss/loki/
- https://grafana.com/docs/loki/latest/ - https://grafana.com/docs/loki/latest/
type: application type: application
version: 3.0.13 version: 3.0.14
annotations: annotations:
truecharts.org/catagories: | truecharts.org/catagories: |
- metrics - metrics
charts/dependency/promtail/templates/_servicemonitor.tpl
+3 -3
View File
@@ -4,13 +4,13 @@
apiVersion: monitoring.coreos.com/v1 apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor kind: ServiceMonitor
metadata: metadata:
name: {{ include "common.names.fullname" . -}} name: {{ include "tc.common.names.fullname" . -}}
{{- with .Values.serviceMonitor.annotations }} {{- with .Values.serviceMonitor.annotations }}
annotations: annotations:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
labels: labels:
{{- include "common.labels" . | nindent 4 }} {{- include "tc.common.labels" . | nindent 4 }}
{{- with .Values.serviceMonitor.labels }} {{- with .Values.serviceMonitor.labels }}
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
@@ -21,7 +21,7 @@ spec:
{{- end }} {{- end }}
selector: selector:
matchLabels: matchLabels:
{{- include "common.labels.selectorLabels" . | nindent 6 }} {{- include "tc.common.labels.selectorLabels" . | nindent 6 }}
endpoints: endpoints:
- port: http-metrics - port: http-metrics
{{- with .Values.serviceMonitor.interval }} {{- with .Values.serviceMonitor.interval }}
charts/stable/grafana/Chart.yaml
+1 -1
View File
@@ -23,7 +23,7 @@ sources:
- https://github.com/bitnami/bitnami-docker-grafana - https://github.com/bitnami/bitnami-docker-grafana
- https://grafana.com/ - https://grafana.com/
type: application type: application
version: 4.0.14 version: 4.0.15
annotations: annotations:
truecharts.org/catagories: | truecharts.org/catagories: |
- metrics - metrics
charts/stable/grafana/templates/prometheusrules.yaml
+3 -3
View File
@@ -2,15 +2,15 @@
apiVersion: monitoring.coreos.com/v1 apiVersion: monitoring.coreos.com/v1
kind: PrometheusRule kind: PrometheusRule
metadata: metadata:
name: {{ include "common.names.fullname" . }} name: {{ include "tc.common.names.fullname" . }}
labels: labels:
{{- include "common.labels" . | nindent 4 }} {{- include "tc.common.labels" . | nindent 4 }}
{{- with .Values.metrics.prometheusRule.labels }} {{- with .Values.metrics.prometheusRule.labels }}
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
spec: spec:
groups: groups:
- name: {{ include "common.names.fullname" . }} - name: {{ include "tc.common.names.fullname" . }}
rules: rules:
{{- with .Values.metrics.prometheusRule.rules }} {{- with .Values.metrics.prometheusRule.rules }}
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
charts/stable/grafana/templates/servicemonitor.yaml
+3 -3
View File
@@ -2,16 +2,16 @@
apiVersion: monitoring.coreos.com/v1 apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor kind: ServiceMonitor
metadata: metadata:
name: {{ include "common.names.fullname" . }} name: {{ include "tc.common.names.fullname" . }}
labels: labels:
{{- include "common.labels" . | nindent 4 }} {{- include "tc.common.labels" . | nindent 4 }}
{{- with .Values.metrics.serviceMonitor.labels }} {{- with .Values.metrics.serviceMonitor.labels }}
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
spec: spec:
selector: selector:
matchLabels: matchLabels:
{{- include "common.labels.selectorLabels" . | nindent 6 }} {{- include "tc.common.labels.selectorLabels" . | nindent 6 }}
endpoints: endpoints:
- port: main - port: main
{{- with .Values.metrics.serviceMonitor.interval }} {{- with .Values.metrics.serviceMonitor.interval }}
charts/stable/loki/Chart.yaml
+1 -1
View File
@@ -23,7 +23,7 @@ name: loki
sources: sources:
- https://github.com/grafana/loki - https://github.com/grafana/loki
type: application type: application
version: 5.0.8 version: 5.0.9
annotations: annotations:
truecharts.org/catagories: | truecharts.org/catagories: |
- logs - logs
charts/stable/loki/values.yaml
+1 -1
View File
@@ -32,7 +32,7 @@ args:
# alerting: # alerting:
# enabled: true # enabled: true
# data: # data:
# '{{ include "common.names.fullname" . }}-alerting-rules.yaml': |- # '{{ include "tc.common.names.fullname" . }}-alerting-rules.yaml': |-
# {{- if gt (len .Values.alerting_groups) 0 }} # {{- if gt (len .Values.alerting_groups) 0 }}
# groups: # groups:
# {{- toYaml .Values.alerting_groups | nindent 6 }} # {{- toYaml .Values.alerting_groups | nindent 6 }}
charts/stable/promcord/Chart.yaml
+1 -1
View File
@@ -21,7 +21,7 @@ name: promcord
sources: sources:
- https://github.com/nimarion/promcord - https://github.com/nimarion/promcord
type: application type: application
version: 4.0.8 version: 4.0.9
annotations: annotations:
truecharts.org/catagories: | truecharts.org/catagories: |
- metrics - metrics
charts/stable/promcord/templates/prometheusrules.yaml
+4 -4
View File
@@ -2,22 +2,22 @@
apiVersion: monitoring.coreos.com/v1 apiVersion: monitoring.coreos.com/v1
kind: PrometheusRule kind: PrometheusRule
metadata: metadata:
name: {{ include "common.names.fullname" . }} name: {{ include "tc.common.names.fullname" . }}
labels: labels:
{{- include "common.labels" . | nindent 4 }} {{- include "tc.common.labels" . | nindent 4 }}
{{- with .Values.metrics.prometheusRule.labels }} {{- with .Values.metrics.prometheusRule.labels }}
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
spec: spec:
groups: groups:
- name: {{ include "common.names.fullname" . }} - name: {{ include "tc.common.names.fullname" . }}
rules: rules:
- alert: PromcordAbsent - alert: PromcordAbsent
annotations: annotations:
description: Promcord has disappeared from Prometheus service discovery. description: Promcord has disappeared from Prometheus service discovery.
summary: Promcord is down. summary: Promcord is down.
expr: | expr: |
absent(up{job=~".*{{ include "common.names.fullname" . }}.*"} == 1) absent(up{job=~".*{{ include "tc.common.names.fullname" . }}.*"} == 1)
for: 5m for: 5m
labels: labels:
severity: critical severity: critical
charts/stable/promcord/templates/servicemonitor.yaml
+3 -3
View File
@@ -2,16 +2,16 @@
apiVersion: monitoring.coreos.com/v1 apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor kind: ServiceMonitor
metadata: metadata:
name: {{ include "common.names.fullname" . }} name: {{ include "tc.common.names.fullname" . }}
labels: labels:
{{- include "common.labels" . | nindent 4 }} {{- include "tc.common.labels" . | nindent 4 }}
{{- with .Values.metrics.serviceMonitor.labels }} {{- with .Values.metrics.serviceMonitor.labels }}
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
spec: spec:
selector: selector:
matchLabels: matchLabels:
{{- include "common.labels.selectorLabels" . | nindent 6 }} {{- include "tc.common.labels.selectorLabels" . | nindent 6 }}
endpoints: endpoints:
- port: metrics - port: metrics
{{- with .Values.metrics.serviceMonitor.interval }} {{- with .Values.metrics.serviceMonitor.interval }}
charts/stable/speedtest-exporter/Chart.yaml
+1 -1
View File
@@ -21,7 +21,7 @@ name: speedtest-exporter
sources: sources:
- https://github.com/MiguelNdeCarvalho/speedtest-exporter/ - https://github.com/MiguelNdeCarvalho/speedtest-exporter/
type: application type: application
version: 3.0.8 version: 3.0.9
annotations: annotations:
truecharts.org/catagories: | truecharts.org/catagories: |
- metrics - metrics
charts/stable/speedtest-exporter/templates/prometheusrules.yaml
+8 -8
View File
@@ -2,22 +2,22 @@
apiVersion: monitoring.coreos.com/v1 apiVersion: monitoring.coreos.com/v1
kind: PrometheusRule kind: PrometheusRule
metadata: metadata:
name: {{ include "common.names.fullname" . }} name: {{ include "tc.common.names.fullname" . }}
labels: labels:
{{- include "common.labels" . | nindent 4 }} {{- include "tc.common.labels" . | nindent 4 }}
{{- with .Values.metrics.prometheusRule.labels }} {{- with .Values.metrics.prometheusRule.labels }}
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
spec: spec:
groups: groups:
- name: {{ include "common.names.fullname" . }} - name: {{ include "tc.common.names.fullname" . }}
rules: rules:
- alert: SpeedtestExporterAbsent - alert: SpeedtestExporterAbsent
annotations: annotations:
description: Speedtest Exporter has disappeared from Prometheus target discovery. description: Speedtest Exporter has disappeared from Prometheus target discovery.
summary: Speedtest Exporter is down. summary: Speedtest Exporter is down.
expr: | expr: |
absent(up{job=~".*{{ include "common.names.fullname" . }}.*"} == 1) absent(up{job=~".*{{ include "tc.common.names.fullname" . }}.*"} == 1)
for: {{ trimAll "m" .Values.metrics.serviceMonitor.interval | add 15 }}m for: {{ trimAll "m" .Values.metrics.serviceMonitor.interval | add 15 }}m
labels: labels:
severity: critical severity: critical
@@ -26,7 +26,7 @@ spec:
description: Internet download speed is averaging {{ "{{ humanize $value }}" }} Mbps. description: Internet download speed is averaging {{ "{{ humanize $value }}" }} Mbps.
summary: SpeedTest slow internet download. summary: SpeedTest slow internet download.
expr: | expr: |
avg_over_time(speedtest_download_bits_per_second{job=~".*{{ include "common.names.fullname" . }}.*"}[4h]) avg_over_time(speedtest_download_bits_per_second{job=~".*{{ include "tc.common.names.fullname" . }}.*"}[4h])
< {{ .Values.metrics.prometheusRule.downloadLimit }} < {{ .Values.metrics.prometheusRule.downloadLimit }}
for: 0m for: 0m
labels: labels:
@@ -36,7 +36,7 @@ spec:
description: Internet upload speed is averaging {{ "{{ humanize $value }}" }} Mbps. description: Internet upload speed is averaging {{ "{{ humanize $value }}" }} Mbps.
summary: SpeedTest slow internet upload. summary: SpeedTest slow internet upload.
expr: | expr: |
avg_over_time(speedtest_upload_bits_per_second{job=~".*{{ include "common.names.fullname" . }}.*"}[4h]) avg_over_time(speedtest_upload_bits_per_second{job=~".*{{ include "tc.common.names.fullname" . }}.*"}[4h])
< {{ .Values.metrics.prometheusRule.uploadLimit }} < {{ .Values.metrics.prometheusRule.uploadLimit }}
for: 0m for: 0m
labels: labels:
@@ -46,7 +46,7 @@ spec:
description: Internet ping latency is averaging {{ "{{ humanize $value }}" }} ms. description: Internet ping latency is averaging {{ "{{ humanize $value }}" }} ms.
summary: SpeedTest high ping latency. summary: SpeedTest high ping latency.
expr: | expr: |
avg_over_time(speedtest_ping_latency_milliseconds{job=~".*{{ include "common.names.fullname" . }}.*"}[4h]) avg_over_time(speedtest_ping_latency_milliseconds{job=~".*{{ include "tc.common.names.fullname" . }}.*"}[4h])
> {{ .Values.metrics.prometheusRule.pingLimit }} > {{ .Values.metrics.prometheusRule.pingLimit }}
for: 0m for: 0m
labels: labels:
@@ -56,7 +56,7 @@ spec:
description: Internet jitter latency is averaging {{ "{{ humanize $value }}" }} ms. description: Internet jitter latency is averaging {{ "{{ humanize $value }}" }} ms.
summary: SpeedTest high jitter latency. summary: SpeedTest high jitter latency.
expr: | expr: |
avg_over_time(speedtest_jitter_latency_milliseconds{job=~".*{{ include "common.names.fullname" . }}.*"}[4h]) avg_over_time(speedtest_jitter_latency_milliseconds{job=~".*{{ include "tc.common.names.fullname" . }}.*"}[4h])
> {{ .Values.metrics.prometheusRule.jitterLimit }} > {{ .Values.metrics.prometheusRule.jitterLimit }}
for: 0m for: 0m
labels: labels:
charts/stable/speedtest-exporter/templates/servicemonitor.yaml
+3 -3
View File
@@ -2,16 +2,16 @@
apiVersion: monitoring.coreos.com/v1 apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor kind: ServiceMonitor
metadata: metadata:
name: {{ include "common.names.fullname" . }} name: {{ include "tc.common.names.fullname" . }}
labels: labels:
{{- include "common.labels" . | nindent 4 }} {{- include "tc.common.labels" . | nindent 4 }}
{{- with .Values.metrics.serviceMonitor.labels }} {{- with .Values.metrics.serviceMonitor.labels }}
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
spec: spec:
selector: selector:
matchLabels: matchLabels:
{{- include "common.labels.selectorLabels" . | nindent 6 }} {{- include "tc.common.labels.selectorLabels" . | nindent 6 }}
endpoints: endpoints:
- port: metrics - port: metrics
{{- with .Values.metrics.serviceMonitor.interval }} {{- with .Values.metrics.serviceMonitor.interval }}
charts/stable/unpoller/Chart.yaml
+1 -1
View File
@@ -22,7 +22,7 @@ sources:
- https://github.com/unifi-poller/unifi-poller - https://github.com/unifi-poller/unifi-poller
- https://hub.docker.com/r/golift/unifi-poller - https://hub.docker.com/r/golift/unifi-poller
type: application type: application
version: 3.0.8 version: 3.0.9
annotations: annotations:
truecharts.org/catagories: | truecharts.org/catagories: |
- metrics - metrics
charts/stable/unpoller/templates/prometheusrules.yaml
+4 -4
View File
@@ -2,22 +2,22 @@
apiVersion: monitoring.coreos.com/v1 apiVersion: monitoring.coreos.com/v1
kind: PrometheusRule kind: PrometheusRule
metadata: metadata:
name: {{ include "common.names.fullname" . }} name: {{ include "tc.common.names.fullname" . }}
labels: labels:
{{- include "common.labels" . | nindent 4 }} {{- include "tc.common.labels" . | nindent 4 }}
{{- with .Values.metrics.prometheusRule.labels }} {{- with .Values.metrics.prometheusRule.labels }}
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
spec: spec:
groups: groups:
- name: {{ include "common.names.fullname" . }} - name: {{ include "tc.common.names.fullname" . }}
rules: rules:
- alert: UnifiPollerAbsent - alert: UnifiPollerAbsent
annotations: annotations:
description: Unifi Poller has disappeared from Prometheus service discovery. description: Unifi Poller has disappeared from Prometheus service discovery.
summary: Unifi Poller is down. summary: Unifi Poller is down.
expr: | expr: |
absent(up{job=~".*{{ include "common.names.fullname" . }}.*"} == 1) absent(up{job=~".*{{ include "tc.common.names.fullname" . }}.*"} == 1)
for: 5m for: 5m
labels: labels:
severity: critical severity: critical
charts/stable/unpoller/templates/servicemonitor.yaml
+3 -3
View File
@@ -2,16 +2,16 @@
apiVersion: monitoring.coreos.com/v1 apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor kind: ServiceMonitor
metadata: metadata:
name: {{ include "common.names.fullname" . }} name: {{ include "tc.common.names.fullname" . }}
labels: labels:
{{- include "common.labels" . | nindent 4 }} {{- include "tc.common.labels" . | nindent 4 }}
{{- with .Values.metrics.serviceMonitor.labels }} {{- with .Values.metrics.serviceMonitor.labels }}
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
spec: spec:
selector: selector:
matchLabels: matchLabels:
{{- include "common.labels.selectorLabels" . | nindent 6 }} {{- include "tc.common.labels.selectorLabels" . | nindent 6 }}
endpoints: endpoints:
- port: metrics - port: metrics
{{- with .Values.metrics.serviceMonitor.interval }} {{- with .Values.metrics.serviceMonitor.interval }}
charts/stable/uptimerobot-prometheus/Chart.yaml
+1 -1
View File
@@ -23,7 +23,7 @@ sources:
- https://github.com/lekpamartin/uptimerobot_exporter - https://github.com/lekpamartin/uptimerobot_exporter
- https://github.com/k8s-at-home/charts/tree/master/charts/uptimerobot-prometheus - https://github.com/k8s-at-home/charts/tree/master/charts/uptimerobot-prometheus
type: application type: application
version: 4.0.8 version: 4.0.9
annotations: annotations:
truecharts.org/catagories: | truecharts.org/catagories: |
- metrics - metrics
charts/stable/uptimerobot-prometheus/templates/prometheusrules.yaml
+4 -4
View File
@@ -2,22 +2,22 @@
apiVersion: monitoring.coreos.com/v1 apiVersion: monitoring.coreos.com/v1
kind: PrometheusRule kind: PrometheusRule
metadata: metadata:
name: {{ include "common.names.fullname" . }} name: {{ include "tc.common.names.fullname" . }}
labels: labels:
{{- include "common.labels" . | nindent 4 }} {{- include "tc.common.labels" . | nindent 4 }}
{{- with .Values.metrics.prometheusRule.labels }} {{- with .Values.metrics.prometheusRule.labels }}
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
spec: spec:
groups: groups:
- name: {{ include "common.names.fullname" . }} - name: {{ include "tc.common.names.fullname" . }}
rules: rules:
- alert: UptimeRobotExporterAbsent - alert: UptimeRobotExporterAbsent
annotations: annotations:
description: Uptime Robot Exporter has disappeared from Prometheus service discovery. description: Uptime Robot Exporter has disappeared from Prometheus service discovery.
summary: Uptime Robot Exporter is down. summary: Uptime Robot Exporter is down.
expr: | expr: |
absent(up{job=~".*{{ include "common.names.fullname" . }}.*"} == 1) absent(up{job=~".*{{ include "tc.common.names.fullname" . }}.*"} == 1)
for: 5m for: 5m
labels: labels:
severity: critical severity: critical
charts/stable/uptimerobot-prometheus/templates/servicemonitor.yaml
+3 -3
View File
@@ -2,16 +2,16 @@
apiVersion: monitoring.coreos.com/v1 apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor kind: ServiceMonitor
metadata: metadata:
name: {{ include "common.names.fullname" . }} name: {{ include "tc.common.names.fullname" . }}
labels: labels:
{{- include "common.labels" . | nindent 4 }} {{- include "tc.common.labels" . | nindent 4 }}
{{- with .Values.metrics.serviceMonitor.labels }} {{- with .Values.metrics.serviceMonitor.labels }}
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
spec: spec:
selector: selector:
matchLabels: matchLabels:
{{- include "common.labels.selectorLabels" . | nindent 6 }} {{- include "tc.common.labels.selectorLabels" . | nindent 6 }}
endpoints: endpoints:
- port: metrics - port: metrics
{{- with .Values.metrics.serviceMonitor.interval }} {{- with .Values.metrics.serviceMonitor.interval }}