From 6df6bbc6dd5fa768d5717236bc26cac09b49d13c Mon Sep 17 00:00:00 2001 From: Moritz Graf Date: Mon, 31 Oct 2022 17:46:45 +0100 Subject: [PATCH] Adding rgbg-living in prometheus --- k8s/monitoring/alertmanagerconfig.secret.yaml | Bin 0 -> 763 bytes k8s/monitoring/prometheus-operator.secret.yml | 52 +++++++++++++++- k8s/monitoring/servicemonitor.secret.yml | 56 ++++++++++++++++++ 3 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 k8s/monitoring/alertmanagerconfig.secret.yaml create mode 100644 k8s/monitoring/servicemonitor.secret.yml diff --git a/k8s/monitoring/alertmanagerconfig.secret.yaml b/k8s/monitoring/alertmanagerconfig.secret.yaml new file mode 100644 index 0000000000000000000000000000000000000000..fe2f25db6c9c097af43aaf8e1b718aeb8a057d75 GIT binary patch literal 763 zcmV5IQ%but+Jv+!lB*_Q7{>tv4tlzr7UB&BkW|p$p=?6@99sy%ax?}n7G$vTz zPHeL|J?n$?jWB-U-=*N+nDx{5SA6jVKhh5yLP#*8=>LH)p-s2iNyu~A!;w=N_)Ovn zf^+^t>tpd`3a;3L+|EaNx9}@>yd2RSx)f~71?6&sQhYF5cB@X`@3R~BH8-+(-n;T6XB*_Sw(BT*Fk#lg33I zp29(Mrsm2;F4H30y)_Gp3tct>8(&9w>TykCX;`^Ys}aG>1>iN*x>sYy6?3`mKa!S+ zv1OF{ZmaVTzwP?I;z<`-2BvX8**U-q`u3Y&!xEeW{*^#w{`6d1ijPK*8#!4@|04v! z+RC%{NsYyAf7$SxYYQpTjY)AF#SoVI*3O>T8S@k7y>B73>Lv|mM(=(d{QDuO53^;T zs19pnNl08_pyKO1)y;y=EGo+zBw@?)+G)F_!>AunyS8u7uQlAyHGW|=Jr6J$&^yNR z{5QyUoX4s;fJXx2J*}Jo3PCymLOapm9u+l=8I{OlVRoI^FdX<7OX>w)EH^&C;#>08oLRRPd4sElIkqVdxN tu^|A%H7kRv$_Nbzo{xSpUI3M{$ya~e0KW97=*Y`$yqTe)BM=rG9OLO9ea`>@ literal 0 HcmV?d00001 diff --git a/k8s/monitoring/prometheus-operator.secret.yml b/k8s/monitoring/prometheus-operator.secret.yml index c173d13..cbfaf04 100644 --- a/k8s/monitoring/prometheus-operator.secret.yml +++ b/k8s/monitoring/prometheus-operator.secret.yml @@ -3,6 +3,29 @@ prometheus: prometheusSpec: shards: null + # https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-prometheus-stack/values.yaml#L2681 + additionalScrapeConfigs: + - job_name: muc-kitchen + scrape_interval: 1m + basic_auth: + username: ahfahfoozuVeezoong6c + password: aeThoom4deiNgeici0Th + static_configs: + - targets: [ 'dyndns-muc.moritzgraf.de:60200'] + - job_name: muc-living + scrape_interval: 1m + basic_auth: + username: Gul3zooSa5Waphophuag + password: eeLie9Mai9ahfi5ahy2i + static_configs: + - targets: [ 'dyndns-muc.moritzgraf.de:60201'] + - job_name: rgbg-living + scrape_interval: 1m + basic_auth: + username: oot6ainge9aef6iaf4Cu + password: oonohNaej6soh7TooPha + static_configs: + - targets: [ 'dyndns.moritzgraf.de:60200'] ingress: enabled: true hosts: @@ -15,6 +38,10 @@ prometheus: kubernetes.io/ingress.class: "nginx" nginx.ingress.kubernetes.io/force-ssl-redirect: "true" cert-manager.io/cluster-issuer: "letsencrypt-prod" + # see https://kubernetes.github.io/ingress-nginx/examples/auth/basic/ + nginx.ingress.kubernetes.io/auth-type: basic + nginx.ingress.kubernetes.io/auth-secret: prometheus-auth + nginx.ingress.kubernetes.io/auth-realm: 'Authentication Required - jamaan' # prometheusSpec: # scrapeInterval: "300s" logLevel: debug @@ -29,8 +56,31 @@ prometheus: requests: storage: 50Gi selector: {} + extraSecret: + name: "prometheus-auth" + annotations: {} + # moritz Vaej6Quiequ4vo0jaeRa + data: + auth: | + moritz:$2y$05$ZzkskylHGf.2FNy5EhJIWeXrz/oRCe8IXfxLCpp1uIzqoARPWCRLm alertmanager: - enabled: false + enabled: true + ingress: + enabled: true + hosts: + - alertmanager.haumdaucher.de + tls: + - hosts: + - "alertmanager.haumdaucher.de" + secretName: alertmanager-haumdaucher-de + annotations: + kubernetes.io/ingress.class: "nginx" + nginx.ingress.kubernetes.io/force-ssl-redirect: "true" + cert-manager.io/cluster-issuer: "letsencrypt-prod" + # see https://kubernetes.github.io/ingress-nginx/examples/auth/basic/ + nginx.ingress.kubernetes.io/auth-type: basic + nginx.ingress.kubernetes.io/auth-secret: prometheus-auth + nginx.ingress.kubernetes.io/auth-realm: 'Authentication Required - jamaan' grafana: persistence: enabled: true diff --git a/k8s/monitoring/servicemonitor.secret.yml b/k8s/monitoring/servicemonitor.secret.yml new file mode 100644 index 0000000..0dfb763 --- /dev/null +++ b/k8s/monitoring/servicemonitor.secret.yml @@ -0,0 +1,56 @@ +# --- +# kind: "Service" +# apiVersion: "v1" +# metadata: +# namespace: monitoring +# name: muc-kitchen +# labels: +# app: muc-kitchen +# spec: +# type: ExternalName +# externalName: dyndns-muc.moritzgraf.de +# selector: +# app: muc-kitchen + +# --- +# apiVersion: v1 +# kind: Endpoints +# metadata: +# name: muc-kitchen +# namespace: monitoring +# labels: +# app: muc-kitchen +# subsets: +# - addresses: +# - ip: 1.2.3.4 +# - ip: 1.2.3.5 +# ports: +# - port: 30200 +# protocol: TCP +# --- +# apiVersion: monitoring.coreos.com/v1 +# kind: ServiceMonitor +# metadata: +# name: muc-kitchen +# namespace: monitoring +# spec: +# endpoints: +# - path: /metrics +# interval: 15s +# targetPort: 30200 +# scheme: http +# relabelings: +# - sourceLabels: [__address__] +# targetLabel: __address__ +# regex: (.*) +# replacement: "dyndns-muc.moritzgraf.de:30200" +# action: replace +# jobLabel: muc-kitchen +# namespaceSelector: +# matchNames: +# - monitoring +# selector: +# matchExpressions: +# - key: app +# operator: In +# values: ["muc-kitchen"] \ No newline at end of file