diff --git a/badhouseplants/helmfile.yaml b/badhouseplants/helmfile.yaml index 4bc6609..b458b1f 100644 --- a/badhouseplants/helmfile.yaml +++ b/badhouseplants/helmfile.yaml @@ -43,7 +43,7 @@ releases: createNamespace: false - <<: *prometheus - installed: false + installed: true namespace: monitoring-system createNamespace: true diff --git a/badhouseplants/values/values.namespaces.yaml b/badhouseplants/values/values.namespaces.yaml index 93e1841..b477a0b 100644 --- a/badhouseplants/values/values.namespaces.yaml +++ b/badhouseplants/values/values.namespaces.yaml @@ -1,6 +1,6 @@ --- ns: - - name: monitoring + - name: monitoring-system templates: - | {{ range .Values.ns }} diff --git a/badhouseplants/values/values.prometheus.yaml b/badhouseplants/values/values.prometheus.yaml index 5f849b7..11f1a0b 100644 --- a/badhouseplants/values/values.prometheus.yaml +++ b/badhouseplants/values/values.prometheus.yaml @@ -12,8 +12,58 @@ istio: hostname: "grafana.badhouseplants.net" service: prometheus-grafana port: 80 + +coreDns: + enabled: false +kubeEtcd: + enabled: false +kubelet: + enabled: false +kubeApiServer: + enabled: false + +prometheus-node-exporter: + prometheus: + monitor: + enabled: true + jobLabel: jobLabel + interval: 60s + +defaultRules: + create: true + rules: + alertmanager: true + etcd: false + configReloaders: false + general: true + k8s: true + kubeApiserverAvailability: false + kubeApiserverBurnrate: false + kubeApiserverHistogram: false + kubeApiserverSlos: false + kubeControllerManager: false + kubelet: false + kubeProxy: false + kubePrometheusGeneral: false + kubePrometheusNodeRecording: false + kubernetesApps: true + kubernetesResources: true + kubernetesStorage: true + kubernetesSystem: true + kubeSchedulerAlerting: false + kubeSchedulerRecording: true + kubeStateMetrics: true + network: false + node: true + nodeExporterAlerting: true + nodeExporterRecording: true + prometheus: true + prometheusOperator: true + windows: false + prometheus: prometheusSpec: + enableAdminAPI: true retentionSize: 10GB podMonitorNamespaceSelector: any: true @@ -34,6 +84,7 @@ prometheus: resources: requests: storage: 10Gi + grafana: persistence: enabled: true @@ -56,6 +107,7 @@ grafana: tls_skip_verify_insecure: false use_pkce: true role_attribute_path: contains(groups, 'badhouseplants:owners') && 'Admin' || 'Viewer' + dashboardProviders: dashboardproviders.yaml: apiVersion: 1 @@ -68,6 +120,7 @@ grafana: editable: false options: path: /var/lib/grafana/dashboards/default + dashboards: default: gitea-dashboard: @@ -78,6 +131,7 @@ grafana: gnetId: 14584 revision: 1 datasource: Prometheus + datasources: loki.yaml: apiVersion: 1