Compare commits
23 Commits
user-monit
...
user-monit
| Author | SHA1 | Date | |
|---|---|---|---|
|
a747f04036 | ||
|
|
1afef4726f | ||
|
|
b52f889da1 | ||
|
|
e47ae75947 | ||
|
|
753c3dd95f | ||
|
|
628f64b1e8 | ||
|
|
a88b2af56d | ||
|
|
faecd0aa8d | ||
|
|
905d5a2d09 | ||
|
|
0ad1aae355 | ||
|
|
dbb0cc23da | ||
|
|
73c8c6435f | ||
|
|
7385c2af41 | ||
|
|
4482493d5f | ||
|
|
00ba693670 | ||
|
|
3fc8e332ea | ||
|
|
c58fbd2334 | ||
|
|
4df31ddaf6 | ||
|
|
9b00f330b3 | ||
|
|
7bf01de75f | ||
|
|
9687f504e1 | ||
|
|
8e43add4da | ||
|
|
7a01cc94b6 |
21
apps/user-demo.yaml
Normal file
21
apps/user-demo.yaml
Normal file
@@ -0,0 +1,21 @@
|
||||
---
|
||||
apiVersion: argoproj.io/v1alpha1
|
||||
kind: Application
|
||||
metadata:
|
||||
name: <user>-demo
|
||||
namespace: argocd
|
||||
spec:
|
||||
destination:
|
||||
namespace: <user>
|
||||
server: https://kubernetes.default.svc
|
||||
project: default
|
||||
source:
|
||||
repoURL: 'https://gitea.training.cluster.acend.ch/<user>/prometheus-training-lab-setup'
|
||||
path: user-demo/
|
||||
targetRevision: main
|
||||
syncPolicy:
|
||||
automated:
|
||||
prune: true
|
||||
selfHeal: true
|
||||
syncOptions:
|
||||
- Replace=true
|
||||
21
apps/user-prom-stack.yaml
Normal file
21
apps/user-prom-stack.yaml
Normal file
@@ -0,0 +1,21 @@
|
||||
---
|
||||
apiVersion: argoproj.io/v1alpha1
|
||||
kind: Application
|
||||
metadata:
|
||||
name: <user>-prom-stack
|
||||
namespace: argocd
|
||||
spec:
|
||||
destination:
|
||||
namespace: <user>-monitoring
|
||||
server: https://kubernetes.default.svc
|
||||
project: default
|
||||
source:
|
||||
repoURL: 'https://gitea.training.cluster.acend.ch/<user>/prometheus-training-lab-setup'
|
||||
path: charts/user-monitoring/
|
||||
targetRevision: main
|
||||
syncPolicy:
|
||||
automated:
|
||||
prune: true
|
||||
selfHeal: true
|
||||
syncOptions:
|
||||
- Replace=true
|
||||
@@ -15,7 +15,7 @@ type: application
|
||||
# This is the chart version. This version number should be incremented each time you make changes
|
||||
# to the chart and its templates, including the app version.
|
||||
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
||||
version: 0.1.0
|
||||
version: 0.1.1
|
||||
|
||||
# This is the version number of the application being deployed. This version number should be
|
||||
# incremented each time you make changes to the application. Versions are not expected to
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
apiVersion: rbac.authorization.k8s.io/v1
|
||||
kind: Role
|
||||
metadata:
|
||||
name: prometheus-{{ .Values.user }}
|
||||
rules:
|
||||
- apiGroups: [""]
|
||||
resources:
|
||||
- services
|
||||
- endpoints
|
||||
- pods
|
||||
verbs: ["get", "list", "watch"]
|
||||
- apiGroups: [""]
|
||||
resources:
|
||||
- configmaps
|
||||
verbs: ["get"]
|
||||
- apiGroups:
|
||||
- networking.k8s.io
|
||||
resources:
|
||||
- ingresses
|
||||
verbs: ["get", "list", "watch"]
|
||||
@@ -16,6 +16,6 @@ spec:
|
||||
spec:
|
||||
containers:
|
||||
- image: quay.io/acend/example-web-python
|
||||
imagePullPolicy: Always
|
||||
imagePullPolicy: IfNotPresent
|
||||
name: example-web-python
|
||||
restartPolicy: Always
|
||||
|
||||
@@ -1 +1 @@
|
||||
user: user1
|
||||
user: userX # Replace me
|
||||
@@ -15,7 +15,7 @@ type: application
|
||||
# This is the chart version. This version number should be incremented each time you make changes
|
||||
# to the chart and its templates, including the app version.
|
||||
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
||||
version: 0.2.0
|
||||
version: 0.2.6
|
||||
|
||||
# This is the version number of the application being deployed. This version number should be
|
||||
# incremented each time you make changes to the application. Versions are not expected to
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{{- define "alertmanager.alertmanager" }}
|
||||
|
||||
---
|
||||
apiVersion: monitoring.coreos.com/v1
|
||||
kind: Alertmanager
|
||||
metadata:
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{{- define "blackboxexporter.cm" }}
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{{- define "blackboxexporter.deploy" }}
|
||||
---
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
@@ -0,0 +1,18 @@
|
||||
{{- define "blackboxexporter.svc" }}
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: blackbox
|
||||
labels:
|
||||
app.kubernetes.io/name: blackbox-exporter
|
||||
spec:
|
||||
ports:
|
||||
- name: http
|
||||
port: 9115
|
||||
protocol: TCP
|
||||
targetPort: 9115
|
||||
selector:
|
||||
app.kubernetes.io/name: blackbox-exporter
|
||||
type: ClusterIP
|
||||
{{- end }}
|
||||
@@ -1,4 +1,5 @@
|
||||
{{- define "grafana.dashboardprovider" }}
|
||||
---
|
||||
kind: ConfigMap
|
||||
apiVersion: v1
|
||||
metadata:
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{{- define "grafana.datasource" }}
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Secret
|
||||
type: Opaque
|
||||
@@ -15,6 +16,9 @@ stringData:
|
||||
access: proxy
|
||||
editable: false
|
||||
type: prometheus
|
||||
url: http://thanos-query.{{ .Values.user }}-monitoring.svc.cluster.local:10902
|
||||
url: http://thanos-query:10902
|
||||
version: 1
|
||||
{{- if .Values.grafana.datasources }}
|
||||
{{- toYaml .Values.grafana.datasources | nindent 6 }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
@@ -1,4 +1,5 @@
|
||||
{{- define "grafana.deploy" }}
|
||||
---
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{{- define "grafana.ingress" }}
|
||||
---
|
||||
apiVersion: networking.k8s.io/v1
|
||||
kind: Ingress
|
||||
metadata:
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{{- define "grafana.rolebinding" }}
|
||||
---
|
||||
apiVersion: rbac.authorization.k8s.io/v1
|
||||
kind: RoleBinding
|
||||
metadata:
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{{- define "grafana.sa" }}
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: ServiceAccount
|
||||
metadata:
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
{{- define "grafana.servicemonitor" }}
|
||||
---
|
||||
apiVersion: monitoring.coreos.com/v1
|
||||
kind: ServiceMonitor
|
||||
metadata:
|
||||
name: grafana-monitor
|
||||
spec:
|
||||
endpoints:
|
||||
- basicAuth:
|
||||
password:
|
||||
name: basic-auth
|
||||
key: {{ .Values.user }}
|
||||
username:
|
||||
name: basic-auth
|
||||
key: grafana_user
|
||||
interval: 60s
|
||||
port: http
|
||||
scheme: http
|
||||
path: /metrics
|
||||
selector:
|
||||
matchLabels:
|
||||
app.kubernetes.io/name: grafana
|
||||
{{- end }}
|
||||
@@ -1,4 +1,5 @@
|
||||
{{- define "grafana.svc" }}
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{{- define "prometheus.ingress" }}
|
||||
---
|
||||
apiVersion: networking.k8s.io/v1
|
||||
kind: Ingress
|
||||
metadata:
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{{- define "prometheus.role" }}
|
||||
---
|
||||
apiVersion: rbac.authorization.k8s.io/v1
|
||||
kind: Role
|
||||
metadata:
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{{- define "prometheus.rolebinding" }}
|
||||
---
|
||||
apiVersion: rbac.authorization.k8s.io/v1
|
||||
kind: RoleBinding
|
||||
metadata:
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{{- define "prometheus.sa" }}
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: ServiceAccount
|
||||
metadata:
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
{{- define "prometheus.servicemonitor" }}
|
||||
---
|
||||
apiVersion: monitoring.coreos.com/v1
|
||||
kind: ServiceMonitor
|
||||
metadata:
|
||||
labels:
|
||||
app.kubernetes.io/name: prometheus
|
||||
user: {{ .Values.user }}
|
||||
name: {{ .Values.user }}-prometheus-servicemonitor
|
||||
spec:
|
||||
endpoints:
|
||||
- path: /metrics
|
||||
port: web
|
||||
namespaceSelector:
|
||||
matchNames:
|
||||
- {{ .Values.user }}-monitoring
|
||||
selector:
|
||||
matchLabels:
|
||||
operated-prometheus: 'true'
|
||||
{{- end }}
|
||||
@@ -1,4 +1,5 @@
|
||||
{{- define "prometheus.prometheus" }}
|
||||
---
|
||||
apiVersion: monitoring.coreos.com/v1
|
||||
kind: Prometheus
|
||||
metadata:
|
||||
@@ -6,7 +7,11 @@ metadata:
|
||||
app.kubernetes.io/name: prometheus
|
||||
name: prometheus
|
||||
spec:
|
||||
scrapeInterval: 10s
|
||||
{{- if .Values.query.enabled }}
|
||||
thanos:
|
||||
image: quay.io/thanos/thanos:v0.32.3
|
||||
{{- end }}
|
||||
scrapeInterval: 60s
|
||||
serviceAccountName: prometheus-{{ .Values.user }}
|
||||
serviceMonitorNamespaceSelector:
|
||||
matchLabels:
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{{- define "pushgateway.deploy" }}
|
||||
---
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{{- define "pushgateway.servicemonitor" }}
|
||||
---
|
||||
apiVersion: monitoring.coreos.com/v1
|
||||
kind: ServiceMonitor
|
||||
metadata:
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{{- define "pushgateway.svc" }}
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{{- define "query.deploy" }}
|
||||
---
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
@@ -24,9 +25,11 @@ spec:
|
||||
- --query.replica-label=thanos_ruler_replica
|
||||
- --endpoint=prometheus-operated.{{ .Values.user }}-monitoring.svc.cluster.local:10901
|
||||
- --endpoint=thanos-ruler-operated.{{ .Values.user }}-monitoring.svc.cluster.local:10901
|
||||
- --endpoint=prometheus-operated.monitoring.svc.cluster.local:10901
|
||||
- --store=dnssrv+prometheus-operated.{{ .Values.user }}-monitoring.svc.cluster.local
|
||||
- --store=dnssrv+_web._tcp.prometheus-operated.{{ .Values.user }}-monitoring.svc.cluster.local
|
||||
- --store=dnssrv+_grpc._tcp.kube-prometheus-stack-thanos-discovery.monitoring.svc.cluster.local
|
||||
- --store.unhealthy-timeout=3d
|
||||
image: quay.io/thanos/thanos:v0.25.1
|
||||
image: quay.io/thanos/thanos:v0.32.3
|
||||
name: thanos-query
|
||||
ports:
|
||||
- containerPort: 10902
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{{- define "query.ingress" }}
|
||||
---
|
||||
apiVersion: networking.k8s.io/v1
|
||||
kind: Ingress
|
||||
metadata:
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{{- define "query.svc" }}
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{{- define "ruler.ingress" }}
|
||||
---
|
||||
apiVersion: networking.k8s.io/v1
|
||||
kind: Ingress
|
||||
metadata:
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{{- define "ruler.ruler" }}
|
||||
---
|
||||
apiVersion: monitoring.coreos.com/v1
|
||||
kind: ThanosRuler
|
||||
metadata:
|
||||
|
||||
@@ -4,6 +4,13 @@
|
||||
{{- template "alertmanager.alertmanager" . }}
|
||||
{{- end }}
|
||||
|
||||
# blackboxexporter
|
||||
{{- if .Values.blackboxexporter.enabled }}
|
||||
{{- template "blackboxexporter.cm" . }}
|
||||
{{- template "blackboxexporter.deploy" . }}
|
||||
{{- template "blackboxexporter.svc" . }}
|
||||
{{- end }}
|
||||
|
||||
# grafana
|
||||
{{- if .Values.grafana.enabled }}
|
||||
{{- template "grafana.datasource" . }}
|
||||
@@ -12,6 +19,7 @@
|
||||
{{- template "grafana.svc" . }}
|
||||
{{- template "grafana.sa" . }}
|
||||
{{- template "grafana.deploy" . }}
|
||||
{{- template "grafana.servicemonitor" . }}
|
||||
{{- template "grafana.ingress" . }}
|
||||
{{- end }}
|
||||
|
||||
@@ -19,6 +27,7 @@
|
||||
{{- if .Values.prometheus.enabled }}
|
||||
{{- template "prometheus.ingress" . }}
|
||||
{{- template "prometheus.prometheus" . }}
|
||||
{{- template "prometheus.servicemonitor" . }}
|
||||
{{- template "prometheus.role" . }}
|
||||
{{- template "prometheus.rolebinding" . }}
|
||||
{{- template "prometheus.sa" . }}
|
||||
|
||||
@@ -2,6 +2,7 @@ apiVersion: v1
|
||||
data:
|
||||
admin: JDEkSzNRZUlsOHAkZVZZb1h2RERNWk40b3RJT2tBc3AwLw== # $(openssl passwd -1 admin)
|
||||
{{ .Values.user }}: JDEkSzNRZUlsOHAkZVZZb1h2RERNWk40b3RJT2tBc3AwLw== # $(openssl passwd -1 admin)
|
||||
grafana_user: {{ .Values.user | b64enc }}
|
||||
kind: Secret
|
||||
metadata:
|
||||
labels:
|
||||
@@ -1,25 +1,22 @@
|
||||
user: user1
|
||||
|
||||
# alertmanager
|
||||
alertmanager:
|
||||
enabled: true
|
||||
|
||||
# grafana
|
||||
grafana:
|
||||
enabled: true
|
||||
|
||||
user: <user> # Replace me
|
||||
# prometheus
|
||||
prometheus:
|
||||
enabled: true
|
||||
|
||||
# pushgeitwey
|
||||
pushgateway:
|
||||
enabled: true
|
||||
|
||||
# thanos-ruler
|
||||
ruler:
|
||||
enabled: true
|
||||
|
||||
enabled: false
|
||||
# thanos-query
|
||||
query:
|
||||
enabled: true
|
||||
enabled: false
|
||||
# grafana
|
||||
grafana:
|
||||
enabled: false
|
||||
# blackboxexporter
|
||||
blackboxexporter:
|
||||
enabled: false
|
||||
# pushgateway
|
||||
pushgateway:
|
||||
enabled: false
|
||||
# alertmanager
|
||||
alertmanager:
|
||||
enabled: false
|
||||
# thanos-ruler
|
||||
ruler:
|
||||
enabled: false
|
||||
|
||||
3
user-demo/README.md
Normal file
3
user-demo/README.md
Normal file
@@ -0,0 +1,3 @@
|
||||
# Readme
|
||||
|
||||
This is the location for the user demo app.
|
||||
Reference in New Issue
Block a user