fluencelabs · nahsi · Jan 29, 2025 · Jan 28, 2025 · Jan 28, 2025 · Jan 28, 2025
diff --git a/...ring/configs/flux/dashboards/cluster.json → ...ring/configs/flux/dashboards/cluster.json b/...ring/configs/flux/dashboards/cluster.json → ...ring/configs/flux/dashboards/cluster.json
diff --git a/...onfigs/flux/dashboards/control-plane.json → ...onfigs/flux/dashboards/control-plane.json b/...onfigs/flux/dashboards/control-plane.json → ...onfigs/flux/dashboards/control-plane.json
diff --git a/...itoring/configs/flux/dashboards/logs.json → ...itoring/configs/flux/dashboards/logs.json b/...itoring/configs/flux/dashboards/logs.json → ...itoring/configs/flux/dashboards/logs.json
diff --git a/...onitoring/configs/flux/kustomization.yaml → ...onitoring/configs/flux/kustomization.yaml b/...onitoring/configs/flux/kustomization.yaml → ...onitoring/configs/flux/kustomization.yaml
diff --git a/flux/monitoring/configs/flux/podmonitor.yaml → ...s/monitoring/configs/flux/podmonitor.yaml b/flux/monitoring/configs/flux/podmonitor.yaml → ...s/monitoring/configs/flux/podmonitor.yaml
diff --git a/...ring/configs/kubernetes/kustomization.yml → ...ring/configs/kubernetes/kustomization.yml b/...ring/configs/kubernetes/kustomization.yml → ...ring/configs/kubernetes/kustomization.yml
diff --git a/flux/monitoring/configs/kubevirt.yml → ...omponents/monitoring/configs/kubevirt.yml b/flux/monitoring/configs/kubevirt.yml → ...omponents/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/...toring/configs/kubevirt/kustomization.yml → ...toring/configs/kubevirt/kustomization.yml b/...toring/configs/kubevirt/kustomization.yml → ...toring/configs/kubevirt/kustomization.yml
diff --git a/...ring/configs/kubevirt/service-monitor.yml → ...ring/configs/kubevirt/service-monitor.yml b/...ring/configs/kubevirt/service-monitor.yml → ...ring/configs/kubevirt/service-monitor.yml
diff --git a/flux/monitoring/configs/kustomization.yml → ...ents/monitoring/configs/kustomization.yml b/flux/monitoring/configs/kustomization.yml → ...ents/monitoring/configs/kustomization.yml
diff --git a/...figs/system/dashboards/node_exporter.json → ...figs/system/dashboards/node_exporter.json b/...figs/system/dashboards/node_exporter.json → ...figs/system/dashboards/node_exporter.json
diff --git a/...nitoring/configs/system/kustomization.yml → ...nitoring/configs/system/kustomization.yml b/...nitoring/configs/system/kustomization.yml → ...nitoring/configs/system/kustomization.yml
diff --git a/...heus-stack/kube-state-metrics-config.yaml → ...heus-stack/kube-state-metrics-config.yaml b/...heus-stack/kube-state-metrics-config.yaml → ...heus-stack/kube-state-metrics-config.yaml
diff --git a/.../kube-prometheus-stack/kustomization.yaml → .../kube-prometheus-stack/kustomization.yaml b/.../kube-prometheus-stack/kustomization.yaml → .../kube-prometheus-stack/kustomization.yaml
diff --git a/...ube-prometheus-stack/kustomizeconfig.yaml → ...ube-prometheus-stack/kustomizeconfig.yaml b/...ube-prometheus-stack/kustomizeconfig.yaml → ...ube-prometheus-stack/kustomizeconfig.yaml
diff --git a/...lers/kube-prometheus-stack/namespace.yaml → ...lers/kube-prometheus-stack/namespace.yaml b/...lers/kube-prometheus-stack/namespace.yaml → ...lers/kube-prometheus-stack/namespace.yaml
diff --git a/...ollers/kube-prometheus-stack/release.yaml → ...ollers/kube-prometheus-stack/release.yaml b/...ollers/kube-prometheus-stack/release.yaml → ...ollers/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/...ers/kube-prometheus-stack/repository.yaml → ...ers/kube-prometheus-stack/repository.yaml b/...ers/kube-prometheus-stack/repository.yaml → ...ers/kube-prometheus-stack/repository.yaml
diff --git a/...controllers/loki-stack/kustomization.yaml → ...controllers/loki-stack/kustomization.yaml b/...controllers/loki-stack/kustomization.yaml → ...controllers/loki-stack/kustomization.yaml
diff --git a/...oring/controllers/loki-stack/release.yaml → ...oring/controllers/loki-stack/release.yaml b/...oring/controllers/loki-stack/release.yaml → ...oring/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/...ng/controllers/loki-stack/repository.yaml → ...ng/controllers/loki-stack/repository.yaml b/...ng/controllers/loki-stack/repository.yaml → ...ng/controllers/loki-stack/repository.yaml
diff --git 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