diff --git a/apps/monitoring/kustomization.yaml b/apps/monitoring/kustomization.yaml index 2fd9bd9..aaf457b 100644 --- a/apps/monitoring/kustomization.yaml +++ b/apps/monitoring/kustomization.yaml @@ -8,18 +8,7 @@ resources: - grafana.pvc.yaml - influxdb.pvc.yaml - grafana.ingress.yaml - # prometheus-operator crds - - https://github.com/prometheus-operator/prometheus-operator/releases/download/v0.70.0/bundle.yaml - - prometheus.yaml - - thanos-objstore-config.sealedsecret.yaml - # thanos deployment from kube-thanos project - - thanos-store.statefulset.yaml - - thanos-query.deployment.yaml -images: - - name: thanos - newName: quay.io/thanos/thanos - newTag: v0.34.1 helmCharts: - releaseName: grafana diff --git a/infrastructure/prometheus/kustomization.yaml b/infrastructure/prometheus/kustomization.yaml new file mode 100644 index 0000000..c45a151 --- /dev/null +++ b/infrastructure/prometheus/kustomization.yaml @@ -0,0 +1,19 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +namespace: monitoring + +resources: + - namespace.yaml + # prometheus-operator crds + - https://github.com/prometheus-operator/prometheus-operator/releases/download/v0.70.0/bundle.yaml + - prometheus.yaml + - thanos-objstore-config.sealedsecret.yaml + # thanos deployment from kube-thanos project + - thanos-store.statefulset.yaml + - thanos-query.deployment.yaml + +images: + - name: thanos + newName: quay.io/thanos/thanos + newTag: v0.34.1 diff --git a/infrastructure/prometheus/namespace.yaml b/infrastructure/prometheus/namespace.yaml new file mode 100644 index 0000000..0a074bd --- /dev/null +++ b/infrastructure/prometheus/namespace.yaml @@ -0,0 +1,4 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: placeholder diff --git a/apps/monitoring/prometheus.yaml b/infrastructure/prometheus/prometheus.yaml similarity index 100% rename from apps/monitoring/prometheus.yaml rename to infrastructure/prometheus/prometheus.yaml diff --git a/apps/monitoring/thanos-objstore-config.sealedsecret.yaml b/infrastructure/prometheus/thanos-objstore-config.sealedsecret.yaml similarity index 100% rename from apps/monitoring/thanos-objstore-config.sealedsecret.yaml rename to infrastructure/prometheus/thanos-objstore-config.sealedsecret.yaml diff --git a/apps/monitoring/thanos-query.deployment.yaml b/infrastructure/prometheus/thanos-query.deployment.yaml similarity index 100% rename from apps/monitoring/thanos-query.deployment.yaml rename to infrastructure/prometheus/thanos-query.deployment.yaml diff --git a/apps/monitoring/thanos-store.statefulset.yaml b/infrastructure/prometheus/thanos-store.statefulset.yaml similarity index 100% rename from apps/monitoring/thanos-store.statefulset.yaml rename to infrastructure/prometheus/thanos-store.statefulset.yaml diff --git a/kluster-deployments/kustomization.yaml b/kluster-deployments/kustomization.yaml index c928cfc..9564cbb 100644 --- a/kluster-deployments/kustomization.yaml +++ b/kluster-deployments/kustomization.yaml @@ -20,6 +20,7 @@ resources: - traefik/ - external-dns/ - external-services/ + - prometheus/application.yaml # simple apps - adguard/ diff --git a/kluster-deployments/prometheus/application.yaml b/kluster-deployments/prometheus/application.yaml new file mode 100644 index 0000000..f6ee898 --- /dev/null +++ b/kluster-deployments/prometheus/application.yaml @@ -0,0 +1,19 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: prometheus-application + namespace: argocd + +spec: + project: infrastructure + source: + repoURL: git@github.com:moll-re/bootstrap-k3s-infra.git + targetRevision: main + path: infrastructure/prometheus + destination: + server: https://kubernetes.default.svc + namespace: monitoring + syncPolicy: + automated: + prune: true + selfHeal: true