diff --git a/clusters/bee/argocd-apps/grafana-ops.yaml b/clusters/bee/argocd-apps/grafana-ops.yaml index 103f3c8..4007d25 100644 --- a/clusters/bee/argocd-apps/grafana-ops.yaml +++ b/clusters/bee/argocd-apps/grafana-ops.yaml @@ -13,13 +13,10 @@ spec: source: repoURL: https://grafana.github.io/helm-charts chart: grafana - targetRevision: "6.50.6" + targetRevision: "6.50.0" helm: releaseName: grafana-ops values: | - deploymentStrategy: - type: Recreate - ingress: enabled: true @@ -52,16 +49,12 @@ spec: datasources.yaml: apiVersion: 1 datasources: - - name: Prometheus - type: prometheus - url: http://ops-prometheus.monitoring-ops:9090 - access: proxy - isDefault: true - - name: In-Cluster Prometheus + - name: Cluster Prometheus type: prometheus url: http://monitoring-prometheus.monitoring:9090 access: proxy - - name: In-Cluster Loki + isDefault: true + - name: Cluster Loki type: loki url: http://loki-gateway.logging:80 access: proxy diff --git a/clusters/bee/argocd-apps/monitoring-ops.yaml b/clusters/bee/argocd-apps/monitoring-ops.yaml deleted file mode 100644 index 695814b..0000000 --- a/clusters/bee/argocd-apps/monitoring-ops.yaml +++ /dev/null @@ -1,68 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: monitoring-ops - namespace: argocd - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - destination: - namespace: monitoring-ops - server: https://kubernetes.default.svc - project: default - source: - repoURL: https://prometheus-community.github.io/helm-charts - chart: kube-prometheus-stack - targetRevision: "44.3.1" - helm: - releaseName: monitoring-ops - skipCrds: true - values: | - cleanPrometheusOperatorObjectNames: true - fullnameOverride: ops - - defaultRules: - create: false - - prometheus: - podDisruptionBudget: - enabled: true - minAvailable: 1 - maxUnavailable: "" - - prometheusSpec: - logFormat: json - retention: 5d - replicas: 2 - - storageSpec: - volumeClaimTemplate: - spec: - storageClassName: hcloud-volumes - accessModes: ["ReadWriteOnce"] - resources: - requests: - storage: 50Gi - - alertmanager: - enabled: false - - prometheusOperator: - enabled: false - - grafana: - enabled: false - - kubeStateMetrics: - enabled: false - - nodeExporter: - enabled: false - - syncPolicy: - automated: - prune: true - selfHeal: true - - syncOptions: - - CreateNamespace=true