fix

monitor/alertmanager/index.yaml

@@ -6,45 +6,15 @@ metadata:
   name: alertmanager
   description: null
 options:
-  sub-domain:
-    default: alertmanager
-    examples:
-    - alertmanager
-    type: string
-  app-group:
-    default: monitor
-    examples:
-    - monitor
-    type: string
-  logLevel:
-    default: info
-    examples:
-    - info
-    type: string
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
-  retention:
-    default: 120h
-    examples:
-    - 120h
-    type: string
   ingress-class:
     default: traefik
     examples:
     - traefik
     type: string
-  listenLocal:
+  logLevel:
-    default: false
+    default: info
     examples:
-    - false
+    - info
-    type: boolean
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
     type: string
   images:
     default:
@@ -85,15 +55,45 @@ options:
             type: string
         type: object
     type: object
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
   replicas:
     default: 1
     examples:
     - 1
     type: integer
-  domain:
+  sub-domain:
-    default: your-company
+    default: alertmanager
     examples:
-    - your-company
+    - alertmanager
+    type: string
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  retention:
+    default: 120h
+    examples:
+    - 120h
+    type: string
+  listenLocal:
+    default: false
+    examples:
+    - false
+    type: boolean
+  app-group:
+    default: monitor
+    examples:
+    - monitor
+    type: string
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
     type: string
 dependencies:
 - dist: null

monitor/alertmanager/monitoring.coreos.com_v1_Alertmanager_prometheus-community-kube-alertmanager.yaml

@@ -9,9 +9,9 @@ metadata:
     
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: prometheus-community
-    app.kubernetes.io/version: "56.0.2"
+    app.kubernetes.io/version: "56.0.3"
     app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.0.2
+    chart: kube-prometheus-stack-56.0.3
     release: "prometheus-community"
     heritage: "Helm"
 spec:

monitor/alertmanager/monitoring.coreos.com_v1_PrometheusRule_prometheus-community-kube-alertmanager.rules.yaml

@@ -9,9 +9,9 @@ metadata:
     
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: prometheus-community
-    app.kubernetes.io/version: "56.0.2"
+    app.kubernetes.io/version: "56.0.3"
     app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.0.2
+    chart: kube-prometheus-stack-56.0.3
     release: "prometheus-community"
     heritage: "Helm"
 spec:

monitor/alertmanager/monitoring.coreos.com_v1_ServiceMonitor_prometheus-community-kube-alertmanager.yaml

@@ -9,9 +9,9 @@ metadata:
     
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: prometheus-community
-    app.kubernetes.io/version: "56.0.2"
+    app.kubernetes.io/version: "56.0.3"
     app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.0.2
+    chart: kube-prometheus-stack-56.0.3
     release: "prometheus-community"
     heritage: "Helm"
 spec:

monitor/alertmanager/presentation.tf

@@ -8,9 +8,9 @@ locals {
     Authorization   = "Bearer ${data.kubernetes_secret_v1.authentik.data["AUTHENTIK_BOOTSTRAP_TOKEN"]}"
   }
   service           = {
-    "name"  = "prometheus-community-kube-alertmanager"
+    "name"  = "alertmanager-operated"
     "port" = {
-      "number" = 9090
+      "number" = 9093
     }
   }
 }

monitor/alertmanager/v1_ConfigMap_prometheus-community-kube-alertmanager-overview.yaml

@@ -12,9 +12,9 @@ metadata:
     
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: prometheus-community
-    app.kubernetes.io/version: "56.0.2"
+    app.kubernetes.io/version: "56.0.3"
     app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.0.2
+    chart: kube-prometheus-stack-56.0.3
     release: "prometheus-community"
     heritage: "Helm"
 data:

monitor/alertmanager/v1_Secret_alertmanager-prometheus-community-kube-alertmanager.yaml

@@ -9,9 +9,9 @@ metadata:
     
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: prometheus-community
-    app.kubernetes.io/version: "56.0.2"
+    app.kubernetes.io/version: "56.0.3"
     app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.0.2
+    chart: kube-prometheus-stack-56.0.3
     release: "prometheus-community"
     heritage: "Helm"
 data:

monitor/alertmanager/v1_ServiceAccount_prometheus-community-kube-alertmanager.yaml

@@ -12,9 +12,9 @@ metadata:
     
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: prometheus-community
-    app.kubernetes.io/version: "56.0.2"
+    app.kubernetes.io/version: "56.0.3"
     app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.0.2
+    chart: kube-prometheus-stack-56.0.3
     release: "prometheus-community"
     heritage: "Helm"
 automountServiceAccountToken: true

monitor/alertmanager/v1_Service_prometheus-community-kube-alertmanager.yaml

@@ -1,32 +0,0 @@
-# Source: kube-prometheus-stack/templates/alertmanager/service.yaml
-apiVersion: v1
-kind: Service
-metadata:
-  name: prometheus-community-kube-alertmanager
-  namespace: vynil-monitor
-  labels:
-    app: kube-prometheus-stack-alertmanager
-    self-monitor: "true"
-    
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/instance: prometheus-community
-    app.kubernetes.io/version: "56.0.2"
-    app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.0.2
-    release: "prometheus-community"
-    heritage: "Helm"
-spec:
-  ports:
-  - name: http-web
-    port: 9093
-    targetPort: 9093
-    protocol: TCP
-  - name: reloader-web
-    appProtocol: http
-    port: 8080
-    targetPort: reloader-web
-  selector:
-    app.kubernetes.io/name: alertmanager
-    alertmanager: prometheus-community-kube-alertmanager
-  sessionAffinity: None
-  type: "ClusterIP"

monitor/prometheus/datas.tf

@@ -24,7 +24,7 @@ data "kubernetes_secret_v1" "authentik" {
 data "kustomization_overlay" "data" {
   common_labels = local.common-labels
   namespace = var.namespace
-  resources = [for file in fileset(path.module, "*.yaml"): file if file != "index.yaml" && length(regexall("ClusterRole",file))<1]
+  resources = [for file in fileset(path.module, "*.yaml"): file if file != "index.yaml" && length(regexall("ClusterRole",file))<1 && length(regexall("Service_prometheus",file))<1]
   patches {
     target {
       kind = "Prometheus"
@@ -210,7 +210,7 @@ data "kustomization_overlay" "data" {
 
 data "kustomization_overlay" "data_no_ns" {
   common_labels = local.common-labels
-  resources = [for file in fileset(path.module, "*.yaml"): file if length(regexall("ClusterRole",file))>0]
+  resources = [for file in fileset(path.module, "*.yaml"): file if (length(regexall("ClusterRole",file))>0 || length(regexall("Service_prometheus",file))>0)]
 
   patches {
     target {

monitor/prometheus/index.yaml

@@ -6,31 +6,16 @@ metadata:
   name: prometheus
   description: null
 options:
-  listenLocal:
+  app-group:
-    default: false
+    default: monitor
     examples:
-    - false
+    - monitor
-    type: boolean
-  sub-domain:
-    default: prometheus
-    examples:
-    - prometheus
     type: string
-  shards:
-    default: 1
-    examples:
-    - 1
-    type: integer
   retention:
     default: 10d
     examples:
     - 10d
     type: string
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
   images:
     default:
       prometheus:
@@ -70,41 +55,56 @@ options:
             type: string
         type: object
     type: object
+  listenLocal:
+    default: false
+    examples:
+    - false
+    type: boolean
   enableAdminAPI:
     default: false
     examples:
     - false
     type: boolean
-  app-group:
+  sub-domain:
-    default: monitor
+    default: prometheus
     examples:
-    - monitor
+    - prometheus
-    type: string
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  replicas:
-    default: 1
-    examples:
-    - 1
-    type: integer
-  domain:
-    default: your-company
-    examples:
-    - your-company
     type: string
   ingress-class:
     default: traefik
     examples:
     - traefik
     type: string
+  shards:
+    default: 1
+    examples:
+    - 1
+    type: integer
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
   logLevel:
     default: info
     examples:
     - info
     type: string
+  replicas:
+    default: 1
+    examples:
+    - 1
+    type: integer
 dependencies:
 - dist: null
   category: share

monitor/prometheus/monitoring.coreos.com_v1_PrometheusRule_prometheus-community-kube-kubelet.rules.yaml

@@ -9,9 +9,9 @@ metadata:
     
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: prometheus-community
-    app.kubernetes.io/version: "56.0.2"
+    app.kubernetes.io/version: "56.0.3"
     app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.0.2
+    chart: kube-prometheus-stack-56.0.3
     release: "prometheus-community"
     heritage: "Helm"
 spec:

monitor/prometheus/monitoring.coreos.com_v1_PrometheusRule_prometheus-community-kube-kubernetes-system-kube-proxy.yaml

@@ -9,9 +9,9 @@ metadata:
     
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: prometheus-community
-    app.kubernetes.io/version: "56.0.2"
+    app.kubernetes.io/version: "56.0.3"
     app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.0.2
+    chart: kube-prometheus-stack-56.0.3
     release: "prometheus-community"
     heritage: "Helm"
 spec:

monitor/prometheus/monitoring.coreos.com_v1_PrometheusRule_prometheus-community-kube-prometheus.yaml

@@ -9,9 +9,9 @@ metadata:
     
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: prometheus-community
-    app.kubernetes.io/version: "56.0.2"
+    app.kubernetes.io/version: "56.0.3"
     app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.0.2
+    chart: kube-prometheus-stack-56.0.3
     release: "prometheus-community"
     heritage: "Helm"
 spec:

monitor/prometheus/monitoring.coreos.com_v1_Prometheus_prometheus-community-kube-prometheus.yaml

@@ -9,9 +9,9 @@ metadata:
     
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: prometheus-community
-    app.kubernetes.io/version: "56.0.2"
+    app.kubernetes.io/version: "56.0.3"
     app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.0.2
+    chart: kube-prometheus-stack-56.0.3
     release: "prometheus-community"
     heritage: "Helm"
 spec:

monitor/prometheus/monitoring.coreos.com_v1_ServiceMonitor_prometheus-community-kube-coredns.yaml

@@ -9,9 +9,9 @@ metadata:
     
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: prometheus-community
-    app.kubernetes.io/version: "56.0.2"
+    app.kubernetes.io/version: "56.0.3"
     app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.0.2
+    chart: kube-prometheus-stack-56.0.3
     release: "prometheus-community"
     heritage: "Helm"
 spec:

monitor/prometheus/monitoring.coreos.com_v1_ServiceMonitor_prometheus-community-kube-kube-proxy.yaml

@@ -9,9 +9,9 @@ metadata:
     
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: prometheus-community
-    app.kubernetes.io/version: "56.0.2"
+    app.kubernetes.io/version: "56.0.3"
     app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.0.2
+    chart: kube-prometheus-stack-56.0.3
     release: "prometheus-community"
     heritage: "Helm"
 spec:

monitor/prometheus/monitoring.coreos.com_v1_ServiceMonitor_prometheus-community-kube-kubelet.yaml

@@ -8,9 +8,9 @@ metadata:
     app: kube-prometheus-stack-kubelet    
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: prometheus-community
-    app.kubernetes.io/version: "56.0.2"
+    app.kubernetes.io/version: "56.0.3"
     app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.0.2
+    chart: kube-prometheus-stack-56.0.3
     release: "prometheus-community"
     heritage: "Helm"
 spec:

monitor/prometheus/monitoring.coreos.com_v1_ServiceMonitor_prometheus-community-kube-prometheus.yaml

@@ -9,9 +9,9 @@ metadata:
     
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: prometheus-community
-    app.kubernetes.io/version: "56.0.2"
+    app.kubernetes.io/version: "56.0.3"
     app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.0.2
+    chart: kube-prometheus-stack-56.0.3
     release: "prometheus-community"
     heritage: "Helm"
 spec:

monitor/prometheus/presentation.tf

@@ -8,7 +8,7 @@ locals {
     Authorization   = "Bearer ${data.kubernetes_secret_v1.authentik.data["AUTHENTIK_BOOTSTRAP_TOKEN"]}"
   }
   service           = {
-    "name"  = "prometheus-community-kube-prometheus"
+    "name"  = "prometheus-operated"
     "port" = {
       "number" = 9090
     }

monitor/prometheus/rbac.authorization.k8s.io_v1_ClusterRoleBinding_prometheus-community-kube-prometheus.yaml

@@ -8,9 +8,9 @@ metadata:
     
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: prometheus-community
-    app.kubernetes.io/version: "56.0.2"
+    app.kubernetes.io/version: "56.0.3"
     app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.0.2
+    chart: kube-prometheus-stack-56.0.3
     release: "prometheus-community"
     heritage: "Helm"
 roleRef:

monitor/prometheus/rbac.authorization.k8s.io_v1_ClusterRole_prometheus-community-kube-prometheus.yaml

@@ -8,9 +8,9 @@ metadata:
     
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: prometheus-community
-    app.kubernetes.io/version: "56.0.2"
+    app.kubernetes.io/version: "56.0.3"
     app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.0.2
+    chart: kube-prometheus-stack-56.0.3
     release: "prometheus-community"
     heritage: "Helm"
 rules:

monitor/prometheus/v1_ConfigMap_prometheus-community-kube-grafana-datasource.yaml

@@ -10,9 +10,9 @@ metadata:
     
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: prometheus-community
-    app.kubernetes.io/version: "56.0.2"
+    app.kubernetes.io/version: "56.0.3"
     app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.0.2
+    chart: kube-prometheus-stack-56.0.3
     release: "prometheus-community"
     heritage: "Helm"
 data:

monitor/prometheus/v1_ConfigMap_prometheus-community-kube-k8s-coredns.yaml

@@ -12,9 +12,9 @@ metadata:
     
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: prometheus-community
-    app.kubernetes.io/version: "56.0.2"
+    app.kubernetes.io/version: "56.0.3"
     app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.0.2
+    chart: kube-prometheus-stack-56.0.3
     release: "prometheus-community"
     heritage: "Helm"
 data:

monitor/prometheus/v1_ConfigMap_prometheus-community-kube-kubelet.yaml

@@ -12,9 +12,9 @@ metadata:
     
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: prometheus-community
-    app.kubernetes.io/version: "56.0.2"
+    app.kubernetes.io/version: "56.0.3"
     app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.0.2
+    chart: kube-prometheus-stack-56.0.3
     release: "prometheus-community"
     heritage: "Helm"
 data:

monitor/prometheus/v1_ConfigMap_prometheus-community-kube-prometheus.yaml

@@ -12,9 +12,9 @@ metadata:
     
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: prometheus-community
-    app.kubernetes.io/version: "56.0.2"
+    app.kubernetes.io/version: "56.0.3"
     app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.0.2
+    chart: kube-prometheus-stack-56.0.3
     release: "prometheus-community"
     heritage: "Helm"
 data:

monitor/prometheus/v1_ConfigMap_prometheus-community-kube-proxy.yaml

@@ -12,9 +12,9 @@ metadata:
     
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: prometheus-community
-    app.kubernetes.io/version: "56.0.2"
+    app.kubernetes.io/version: "56.0.3"
     app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.0.2
+    chart: kube-prometheus-stack-56.0.3
     release: "prometheus-community"
     heritage: "Helm"
 data:

monitor/prometheus/v1_Secret_prometheus-community-kube-prometheus.yaml

@@ -10,9 +10,9 @@ metadata:
     
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: prometheus-community
-    app.kubernetes.io/version: "56.0.2"
+    app.kubernetes.io/version: "56.0.3"
     app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.0.2
+    chart: kube-prometheus-stack-56.0.3
     release: "prometheus-community"
     heritage: "Helm"
 data:

monitor/prometheus/v1_ServiceAccount_prometheus-community-kube-prometheus.yaml

@@ -12,8 +12,8 @@ metadata:
     
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: prometheus-community
-    app.kubernetes.io/version: "56.0.2"
+    app.kubernetes.io/version: "56.0.3"
     app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.0.2
+    chart: kube-prometheus-stack-56.0.3
     release: "prometheus-community"
     heritage: "Helm"

monitor/prometheus/v1_Service_prometheus-community-kube-coredns.yaml

@@ -9,9 +9,9 @@ metadata:
     
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: prometheus-community
-    app.kubernetes.io/version: "56.0.2"
+    app.kubernetes.io/version: "56.0.3"
     app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.0.2
+    chart: kube-prometheus-stack-56.0.3
     release: "prometheus-community"
     heritage: "Helm"
   namespace: kube-system

monitor/prometheus/v1_Service_prometheus-community-kube-kube-proxy.yaml

@@ -9,9 +9,9 @@ metadata:
     
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: prometheus-community
-    app.kubernetes.io/version: "56.0.2"
+    app.kubernetes.io/version: "56.0.3"
     app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.0.2
+    chart: kube-prometheus-stack-56.0.3
     release: "prometheus-community"
     heritage: "Helm"
   namespace: kube-system

monitor/prometheus/v1_Service_prometheus-community-kube-prometheus.yaml

@@ -1,32 +0,0 @@
-# Source: kube-prometheus-stack/templates/prometheus/service.yaml
-apiVersion: v1
-kind: Service
-metadata:
-  name: prometheus-community-kube-prometheus
-  namespace: vynil-monitor
-  labels:
-    app: kube-prometheus-stack-prometheus
-    self-monitor: "true"
-    
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/instance: prometheus-community
-    app.kubernetes.io/version: "56.0.2"
-    app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.0.2
-    release: "prometheus-community"
-    heritage: "Helm"
-spec:
-  ports:
-  - name: http-web
-    port: 9090
-    targetPort: 9090
-  - name: reloader-web
-    appProtocol: http
-    port: 8080
-    targetPort: reloader-web
-  publishNotReadyAddresses: false
-  selector:
-    app.kubernetes.io/name: prometheus
-    operator.prometheus.io/name: prometheus-community-kube-prometheus
-  sessionAffinity: None
-  type: "ClusterIP"