Cloned2Preserve
/
TrueChartsClone
mirror of https://github.com/truecharts/charts.git
1
0
Fork 0
Code

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

This commit is contained in:
Stavros Kois 2022-06-30 11:48:43 +03:00 committed by GitHub
parent d3923bb65c
commit b356c7f740
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/dependency/promtail/Chart.yaml
View File

@ -22,7 +22,7 @@ sources:
- https://grafana.com/oss/loki/
- https://grafana.com/docs/loki/latest/
type: application
version: 3.0.13
version: 3.0.14
annotations:
truecharts.org/catagories: |
- metrics

6
charts/dependency/promtail/templates/_servicemonitor.tpl
View File

@ -4,13 +4,13 @@
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: {{ include "common.names.fullname" . -}}
name: {{ include "tc.common.names.fullname" . -}}
{{- with .Values.serviceMonitor.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
labels:
{{- include "common.labels" . | nindent 4 }}
{{- include "tc.common.labels" . | nindent 4 }}
{{- with .Values.serviceMonitor.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
@ -21,7 +21,7 @@ spec:
{{- end }}
selector:
matchLabels:
{{- include "common.labels.selectorLabels" . | nindent 6 }}
{{- include "tc.common.labels.selectorLabels" . | nindent 6 }}
endpoints:
- port: http-metrics
{{- with .Values.serviceMonitor.interval }}

2
charts/stable/grafana/Chart.yaml
View File

@ -23,7 +23,7 @@ sources:
- https://github.com/bitnami/bitnami-docker-grafana
- https://grafana.com/
type: application
version: 4.0.14
version: 4.0.15
annotations:
truecharts.org/catagories: |
- metrics

6
charts/stable/grafana/templates/prometheusrules.yaml
View File

@ -2,15 +2,15 @@
apiVersion: monitoring.coreos.com/v1
kind: PrometheusRule
metadata:
name: {{ include "common.names.fullname" . }}
name: {{ include "tc.common.names.fullname" . }}
labels:
{{- include "common.labels" . | nindent 4 }}
{{- include "tc.common.labels" . | nindent 4 }}
{{- with .Values.metrics.prometheusRule.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
groups:
- name: {{ include "common.names.fullname" . }}
- name: {{ include "tc.common.names.fullname" . }}
rules:
{{- with .Values.metrics.prometheusRule.rules }}
{{- toYaml . | nindent 8 }}

6
charts/stable/grafana/templates/servicemonitor.yaml
View File

@ -2,16 +2,16 @@
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: {{ include "common.names.fullname" . }}
name: {{ include "tc.common.names.fullname" . }}
labels:
{{- include "common.labels" . | nindent 4 }}
{{- include "tc.common.labels" . | nindent 4 }}
{{- with .Values.metrics.serviceMonitor.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
selector:
matchLabels:
{{- include "common.labels.selectorLabels" . | nindent 6 }}
{{- include "tc.common.labels.selectorLabels" . | nindent 6 }}
endpoints:
- port: main
{{- with .Values.metrics.serviceMonitor.interval }}

2
charts/stable/loki/Chart.yaml
View File

@ -23,7 +23,7 @@ name: loki
sources:
- https://github.com/grafana/loki
type: application
version: 5.0.8
version: 5.0.9
annotations:
truecharts.org/catagories: |
- logs

2
charts/stable/loki/values.yaml
View File

@ -32,7 +32,7 @@ args:
# alerting:
# enabled: true
# data:
# '{{ include "common.names.fullname" . }}-alerting-rules.yaml': |-
# '{{ include "tc.common.names.fullname" . }}-alerting-rules.yaml': |-
# {{- if gt (len .Values.alerting_groups) 0 }}
# groups:
# {{- toYaml .Values.alerting_groups | nindent 6 }}

2
charts/stable/promcord/Chart.yaml
View File

@ -21,7 +21,7 @@ name: promcord
sources:
- https://github.com/nimarion/promcord
type: application
version: 4.0.8
version: 4.0.9
annotations:
truecharts.org/catagories: |
- metrics

8
charts/stable/promcord/templates/prometheusrules.yaml
View File

@ -2,22 +2,22 @@
apiVersion: monitoring.coreos.com/v1
kind: PrometheusRule
metadata:
name: {{ include "common.names.fullname" . }}
name: {{ include "tc.common.names.fullname" . }}
labels:
{{- include "common.labels" . | nindent 4 }}
{{- include "tc.common.labels" . | nindent 4 }}
{{- with .Values.metrics.prometheusRule.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
groups:
- name: {{ include "common.names.fullname" . }}
- name: {{ include "tc.common.names.fullname" . }}
rules:
- alert: PromcordAbsent
annotations:
description: Promcord has disappeared from Prometheus service discovery.
summary: Promcord is down.
expr: |
absent(up{job=~".*{{ include "common.names.fullname" . }}.*"} == 1)
absent(up{job=~".*{{ include "tc.common.names.fullname" . }}.*"} == 1)
for: 5m
labels:
severity: critical

6
charts/stable/promcord/templates/servicemonitor.yaml
View File

@ -2,16 +2,16 @@
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: {{ include "common.names.fullname" . }}
name: {{ include "tc.common.names.fullname" . }}
labels:
{{- include "common.labels" . | nindent 4 }}
{{- include "tc.common.labels" . | nindent 4 }}
{{- with .Values.metrics.serviceMonitor.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
selector:
matchLabels:
{{- include "common.labels.selectorLabels" . | nindent 6 }}
{{- include "tc.common.labels.selectorLabels" . | nindent 6 }}
endpoints:
- port: metrics
{{- with .Values.metrics.serviceMonitor.interval }}

2
charts/stable/speedtest-exporter/Chart.yaml
View File

@ -21,7 +21,7 @@ name: speedtest-exporter
sources:
- https://github.com/MiguelNdeCarvalho/speedtest-exporter/
type: application
version: 3.0.8
version: 3.0.9
annotations:
truecharts.org/catagories: |
- metrics

16
charts/stable/speedtest-exporter/templates/prometheusrules.yaml
View File

@ -2,22 +2,22 @@
apiVersion: monitoring.coreos.com/v1
kind: PrometheusRule
metadata:
name: {{ include "common.names.fullname" . }}
name: {{ include "tc.common.names.fullname" . }}
labels:
{{- include "common.labels" . | nindent 4 }}
{{- include "tc.common.labels" . | nindent 4 }}
{{- with .Values.metrics.prometheusRule.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
groups:
- name: {{ include "common.names.fullname" . }}
- name: {{ include "tc.common.names.fullname" . }}
rules:
- alert: SpeedtestExporterAbsent
annotations:
description: Speedtest Exporter has disappeared from Prometheus target discovery.
summary: Speedtest Exporter is down.
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
labels:
severity: critical
@ -26,7 +26,7 @@ spec:
description: Internet download speed is averaging {{ "{{ humanize $value }}" }} Mbps.
summary: SpeedTest slow internet download.
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 }}
for: 0m
labels:
@ -36,7 +36,7 @@ spec:
description: Internet upload speed is averaging {{ "{{ humanize $value }}" }} Mbps.
summary: SpeedTest slow internet upload.
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 }}
for: 0m
labels:
@ -46,7 +46,7 @@ spec:
description: Internet ping latency is averaging {{ "{{ humanize $value }}" }} ms.
summary: SpeedTest high ping latency.
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 }}
for: 0m
labels:
@ -56,7 +56,7 @@ spec:
description: Internet jitter latency is averaging {{ "{{ humanize $value }}" }} ms.
summary: SpeedTest high jitter latency.
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 }}
for: 0m
labels:

6
charts/stable/speedtest-exporter/templates/servicemonitor.yaml
View File

@ -2,16 +2,16 @@
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: {{ include "common.names.fullname" . }}
name: {{ include "tc.common.names.fullname" . }}
labels:
{{- include "common.labels" . | nindent 4 }}
{{- include "tc.common.labels" . | nindent 4 }}
{{- with .Values.metrics.serviceMonitor.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
selector:
matchLabels:
{{- include "common.labels.selectorLabels" . | nindent 6 }}
{{- include "tc.common.labels.selectorLabels" . | nindent 6 }}
endpoints:
- port: metrics
{{- with .Values.metrics.serviceMonitor.interval }}

2
charts/stable/unpoller/Chart.yaml
View File

@ -22,7 +22,7 @@ sources:
- https://github.com/unifi-poller/unifi-poller
- https://hub.docker.com/r/golift/unifi-poller
type: application
version: 3.0.8
version: 3.0.9
annotations:
truecharts.org/catagories: |
- metrics

8
charts/stable/unpoller/templates/prometheusrules.yaml
View File

@ -2,22 +2,22 @@
apiVersion: monitoring.coreos.com/v1
kind: PrometheusRule
metadata:
name: {{ include "common.names.fullname" . }}
name: {{ include "tc.common.names.fullname" . }}
labels:
{{- include "common.labels" . | nindent 4 }}
{{- include "tc.common.labels" . | nindent 4 }}
{{- with .Values.metrics.prometheusRule.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
groups:
- name: {{ include "common.names.fullname" . }}
- name: {{ include "tc.common.names.fullname" . }}
rules:
- alert: UnifiPollerAbsent
annotations:
description: Unifi Poller has disappeared from Prometheus service discovery.
summary: Unifi Poller is down.
expr: |
absent(up{job=~".*{{ include "common.names.fullname" . }}.*"} == 1)
absent(up{job=~".*{{ include "tc.common.names.fullname" . }}.*"} == 1)
for: 5m
labels:
severity: critical

6
charts/stable/unpoller/templates/servicemonitor.yaml
View File

@ -2,16 +2,16 @@
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: {{ include "common.names.fullname" . }}
name: {{ include "tc.common.names.fullname" . }}
labels:
{{- include "common.labels" . | nindent 4 }}
{{- include "tc.common.labels" . | nindent 4 }}
{{- with .Values.metrics.serviceMonitor.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
selector:
matchLabels:
{{- include "common.labels.selectorLabels" . | nindent 6 }}
{{- include "tc.common.labels.selectorLabels" . | nindent 6 }}
endpoints:
- port: metrics
{{- with .Values.metrics.serviceMonitor.interval }}

2
charts/stable/uptimerobot-prometheus/Chart.yaml
View File

@ -23,7 +23,7 @@ sources:
- https://github.com/lekpamartin/uptimerobot_exporter
- https://github.com/k8s-at-home/charts/tree/master/charts/uptimerobot-prometheus
type: application
version: 4.0.8
version: 4.0.9
annotations:
truecharts.org/catagories: |
- metrics

8
charts/stable/uptimerobot-prometheus/templates/prometheusrules.yaml
View File

@ -2,22 +2,22 @@
apiVersion: monitoring.coreos.com/v1
kind: PrometheusRule
metadata:
name: {{ include "common.names.fullname" . }}
name: {{ include "tc.common.names.fullname" . }}
labels:
{{- include "common.labels" . | nindent 4 }}
{{- include "tc.common.labels" . | nindent 4 }}
{{- with .Values.metrics.prometheusRule.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
groups:
- name: {{ include "common.names.fullname" . }}
- name: {{ include "tc.common.names.fullname" . }}
rules:
- alert: UptimeRobotExporterAbsent
annotations:
description: Uptime Robot Exporter has disappeared from Prometheus service discovery.
summary: Uptime Robot Exporter is down.
expr: |
absent(up{job=~".*{{ include "common.names.fullname" . }}.*"} == 1)
absent(up{job=~".*{{ include "tc.common.names.fullname" . }}.*"} == 1)
for: 5m
labels:
severity: critical

6
charts/stable/uptimerobot-prometheus/templates/servicemonitor.yaml
View File

@ -2,16 +2,16 @@
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: {{ include "common.names.fullname" . }}
name: {{ include "tc.common.names.fullname" . }}
labels:
{{- include "common.labels" . | nindent 4 }}
{{- include "tc.common.labels" . | nindent 4 }}
{{- with .Values.metrics.serviceMonitor.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
selector:
matchLabels:
{{- include "common.labels.selectorLabels" . | nindent 6 }}
{{- include "tc.common.labels.selectorLabels" . | nindent 6 }}
endpoints:
- port: metrics
{{- with .Values.metrics.serviceMonitor.interval }}