diff --git a/flux/monitoring/configs/flux/dashboards/cluster.json b/flux/components/monitoring/configs/flux/dashboards/cluster.json similarity index 100% rename from flux/monitoring/configs/flux/dashboards/cluster.json rename to flux/components/monitoring/configs/flux/dashboards/cluster.json diff --git a/flux/monitoring/configs/flux/dashboards/control-plane.json b/flux/components/monitoring/configs/flux/dashboards/control-plane.json similarity index 100% rename from flux/monitoring/configs/flux/dashboards/control-plane.json rename to flux/components/monitoring/configs/flux/dashboards/control-plane.json diff --git a/flux/monitoring/configs/flux/dashboards/logs.json b/flux/components/monitoring/configs/flux/dashboards/logs.json similarity index 100% rename from flux/monitoring/configs/flux/dashboards/logs.json rename to flux/components/monitoring/configs/flux/dashboards/logs.json diff --git a/flux/monitoring/configs/flux/kustomization.yaml b/flux/components/monitoring/configs/flux/kustomization.yaml similarity index 100% rename from flux/monitoring/configs/flux/kustomization.yaml rename to flux/components/monitoring/configs/flux/kustomization.yaml diff --git a/flux/monitoring/configs/flux/podmonitor.yaml b/flux/components/monitoring/configs/flux/podmonitor.yaml similarity index 100% rename from flux/monitoring/configs/flux/podmonitor.yaml rename to flux/components/monitoring/configs/flux/podmonitor.yaml diff --git a/flux/monitoring/configs/kubernetes/kustomization.yml b/flux/components/monitoring/configs/kubernetes/kustomization.yml similarity index 100% rename from flux/monitoring/configs/kubernetes/kustomization.yml rename to flux/components/monitoring/configs/kubernetes/kustomization.yml diff --git a/flux/monitoring/configs/kubevirt.yml b/flux/components/monitoring/configs/kubevirt.yml similarity index 85% rename from flux/monitoring/configs/kubevirt.yml rename to flux/components/monitoring/configs/kubevirt.yml index c3b0c156..c1fa5e27 100644 --- a/flux/monitoring/configs/kubevirt.yml +++ b/flux/components/monitoring/configs/kubevirt.yml @@ -5,7 +5,7 @@ metadata: namespace: flux-system spec: interval: 1m0s - path: ./flux/monitoring/configs/kubevirt + path: ./flux/components/monitoring/configs/kubevirt prune: true sourceRef: kind: GitRepository diff --git a/flux/monitoring/configs/kubevirt/kustomization.yml b/flux/components/monitoring/configs/kubevirt/kustomization.yml similarity index 100% rename from flux/monitoring/configs/kubevirt/kustomization.yml rename to flux/components/monitoring/configs/kubevirt/kustomization.yml diff --git a/flux/monitoring/configs/kubevirt/service-monitor.yml b/flux/components/monitoring/configs/kubevirt/service-monitor.yml similarity index 100% rename from flux/monitoring/configs/kubevirt/service-monitor.yml rename to flux/components/monitoring/configs/kubevirt/service-monitor.yml diff --git a/flux/monitoring/configs/kustomization.yml b/flux/components/monitoring/configs/kustomization.yml similarity index 100% rename from flux/monitoring/configs/kustomization.yml rename to flux/components/monitoring/configs/kustomization.yml diff --git a/flux/monitoring/configs/system/dashboards/node_exporter.json b/flux/components/monitoring/configs/system/dashboards/node_exporter.json similarity index 100% rename from flux/monitoring/configs/system/dashboards/node_exporter.json rename to flux/components/monitoring/configs/system/dashboards/node_exporter.json diff --git a/flux/monitoring/configs/system/kustomization.yml b/flux/components/monitoring/configs/system/kustomization.yml similarity index 100% rename from flux/monitoring/configs/system/kustomization.yml rename to flux/components/monitoring/configs/system/kustomization.yml diff --git a/flux/monitoring/controllers/kube-prometheus-stack/kube-state-metrics-config.yaml b/flux/components/monitoring/controllers/kube-prometheus-stack/kube-state-metrics-config.yaml similarity index 100% rename from flux/monitoring/controllers/kube-prometheus-stack/kube-state-metrics-config.yaml rename to flux/components/monitoring/controllers/kube-prometheus-stack/kube-state-metrics-config.yaml diff --git a/flux/monitoring/controllers/kube-prometheus-stack/kustomization.yaml b/flux/components/monitoring/controllers/kube-prometheus-stack/kustomization.yaml similarity index 100% rename from flux/monitoring/controllers/kube-prometheus-stack/kustomization.yaml rename to flux/components/monitoring/controllers/kube-prometheus-stack/kustomization.yaml diff --git a/flux/monitoring/controllers/kube-prometheus-stack/kustomizeconfig.yaml b/flux/components/monitoring/controllers/kube-prometheus-stack/kustomizeconfig.yaml similarity index 100% rename from flux/monitoring/controllers/kube-prometheus-stack/kustomizeconfig.yaml rename to flux/components/monitoring/controllers/kube-prometheus-stack/kustomizeconfig.yaml diff --git a/flux/monitoring/controllers/kube-prometheus-stack/namespace.yaml b/flux/components/monitoring/controllers/kube-prometheus-stack/namespace.yaml similarity index 100% rename from flux/monitoring/controllers/kube-prometheus-stack/namespace.yaml rename to flux/components/monitoring/controllers/kube-prometheus-stack/namespace.yaml diff --git a/flux/monitoring/controllers/kube-prometheus-stack/release.yaml b/flux/components/monitoring/controllers/kube-prometheus-stack/release.yaml similarity index 94% rename from flux/monitoring/controllers/kube-prometheus-stack/release.yaml rename to flux/components/monitoring/controllers/kube-prometheus-stack/release.yaml index 0a770648..2a5c2be8 100644 --- a/flux/monitoring/controllers/kube-prometheus-stack/release.yaml +++ b/flux/components/monitoring/controllers/kube-prometheus-stack/release.yaml @@ -22,6 +22,10 @@ spec: - kind: ConfigMap name: flux-kube-state-metrics-config valuesKey: kube-state-metrics-config.yaml + - kind: ConfigMap + name: fluence-monitoring-push + valuesKey: metrics.yaml + optional: true # https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-prometheus-stack/values.yaml values: alertmanager: diff --git a/flux/monitoring/controllers/kube-prometheus-stack/repository.yaml b/flux/components/monitoring/controllers/kube-prometheus-stack/repository.yaml similarity index 100% rename from flux/monitoring/controllers/kube-prometheus-stack/repository.yaml rename to flux/components/monitoring/controllers/kube-prometheus-stack/repository.yaml diff --git a/flux/monitoring/controllers/loki-stack/kustomization.yaml b/flux/components/monitoring/controllers/loki-stack/kustomization.yaml similarity index 100% rename from flux/monitoring/controllers/loki-stack/kustomization.yaml rename to flux/components/monitoring/controllers/loki-stack/kustomization.yaml diff --git a/flux/monitoring/controllers/loki-stack/release.yaml b/flux/components/monitoring/controllers/loki-stack/release.yaml similarity index 89% rename from flux/monitoring/controllers/loki-stack/release.yaml rename to flux/components/monitoring/controllers/loki-stack/release.yaml index e5a11b26..0ba246b4 100644 --- a/flux/monitoring/controllers/loki-stack/release.yaml +++ b/flux/components/monitoring/controllers/loki-stack/release.yaml @@ -16,6 +16,11 @@ spec: interval: 60m # https://github.com/grafana/helm-charts/blob/main/charts/loki-stack/values.yaml # https://github.com/grafana/loki/blob/main/production/helm/loki/values.yaml + valuesFrom: + - kind: ConfigMap + name: fluence-monitoring-push + valuesKey: logs.yaml + optional: true values: promtail: enabled: true diff --git a/flux/monitoring/controllers/loki-stack/repository.yaml b/flux/components/monitoring/controllers/loki-stack/repository.yaml similarity index 100% rename from flux/monitoring/controllers/loki-stack/repository.yaml rename to flux/components/monitoring/controllers/loki-stack/repository.yaml diff --git a/flux/components/monitoring/ks.yml b/flux/components/monitoring/ks.yml index 57508c3b..7b09e55c 100644 --- a/flux/components/monitoring/ks.yml +++ b/flux/components/monitoring/ks.yml @@ -6,7 +6,7 @@ metadata: namespace: flux-system spec: interval: 1m0s - path: ./flux/monitoring/controllers + path: ./flux/components/monitoring/controllers prune: true sourceRef: kind: GitRepository @@ -22,7 +22,7 @@ spec: interval: 1m0s dependsOn: - name: monitoring-controllers - path: ./flux/monitoring/configs + path: ./flux/components/monitoring/configs prune: true sourceRef: kind: GitRepository