fix

2024-02-23 14:21:35 +01:00
parent 818a21befc
commit 7c8a52b7e1
125 changed files with 357 additions and 355 deletions
--- a/monitor/prometheus/index.yaml
+++ b/monitor/prometheus/index.yaml
@@ -4,13 +4,23 @@ kind: Component
 category: monitor
 metadata:
  name: prometheus
-  description: null
+  description: An open-source monitoring system with a dimensional data model, flexible query language, efficient time series database and modern alerting approach.
 options:
-  app_group:
-    default: monitor
+  domain:
+    default: your-company
    examples:
-    - monitor
+    - your-company
    type: string
+  ingress_class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  shards:
+    default: 1
+    examples:
+    - 1
+    type: integer
  logLevel:
    default: info
    examples:
@@ -21,51 +31,26 @@ options:
    examples:
    - false
    type: boolean
-  shards:
-    default: 1
-    examples:
-    - 1
-    type: integer
-  retention:
-    default: 10d
-    examples:
-    - 10d
-    type: string
  enableAdminAPI:
    default: false
    examples:
    - false
    type: boolean
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
  issuer:
    default: letsencrypt-prod
    examples:
    - letsencrypt-prod
    type: string
-  replicas:
-    default: 1
+  alertmanager:
+    default: alertmanager-alertmanager
    examples:
-    - 1
-    type: integer
+    - alertmanager-alertmanager
+    type: string
  domain_name:
    default: your_company.com
    examples:
    - your_company.com
    type: string
-  sub_domain:
-    default: prometheus
-    examples:
-    - prometheus
-    type: string
-  ingress_class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
  images:
    default:
      prometheus:
@@ -105,10 +90,25 @@ options:
            type: string
        type: object
    type: object
-  alertmanager:
-    default: alertmanager-alertmanager
+  replicas:
+    default: 1
    examples:
-    - alertmanager-alertmanager
+    - 1
+    type: integer
+  retention:
+    default: 10d
+    examples:
+    - 10d
+    type: string
+  app_group:
+    default: monitor
+    examples:
+    - monitor
+    type: string
+  sub_domain:
+    default: prometheus
+    examples:
+    - prometheus
    type: string
 dependencies:
 - dist: null
--- a/monitor/prometheus/monitoring.coreos.com_v1_PrometheusRule_prometheus-kube-prometheus-kubelet.rules.yaml
+++ b/monitor/prometheus/monitoring.coreos.com_v1_PrometheusRule_prometheus-kube-prometheus-kubelet.rules.yaml
@@ -9,9 +9,9 @@ metadata:
    
    app.kubernetes.io/managed-by: Helm
    app.kubernetes.io/instance: prometheus
-    app.kubernetes.io/version: "56.2.0"
+    app.kubernetes.io/version: "56.9.0"
    app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.2.0
+    chart: kube-prometheus-stack-56.9.0
    release: "prometheus"
    heritage: "Helm"
 spec:
--- a/monitor/prometheus/monitoring.coreos.com_v1_PrometheusRule_prometheus-kube-prometheus-kubernetes-system-kube-proxy.yaml
+++ b/monitor/prometheus/monitoring.coreos.com_v1_PrometheusRule_prometheus-kube-prometheus-kubernetes-system-kube-proxy.yaml
@@ -9,9 +9,9 @@ metadata:
    
    app.kubernetes.io/managed-by: Helm
    app.kubernetes.io/instance: prometheus
-    app.kubernetes.io/version: "56.2.0"
+    app.kubernetes.io/version: "56.9.0"
    app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.2.0
+    chart: kube-prometheus-stack-56.9.0
    release: "prometheus"
    heritage: "Helm"
 spec:
--- a/monitor/prometheus/monitoring.coreos.com_v1_PrometheusRule_prometheus-kube-prometheus-prometheus.yaml
+++ b/monitor/prometheus/monitoring.coreos.com_v1_PrometheusRule_prometheus-kube-prometheus-prometheus.yaml
@@ -9,9 +9,9 @@ metadata:
    
    app.kubernetes.io/managed-by: Helm
    app.kubernetes.io/instance: prometheus
-    app.kubernetes.io/version: "56.2.0"
+    app.kubernetes.io/version: "56.9.0"
    app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.2.0
+    chart: kube-prometheus-stack-56.9.0
    release: "prometheus"
    heritage: "Helm"
 spec:
@@ -108,7 +108,7 @@ spec:
        summary: Prometheus is not ingesting samples.
      expr: |-
        (
-          rate(prometheus_tsdb_head_samples_appended_total{job="prometheus-kube-prometheus-prometheus",namespace="vynil-monitor"}[5m]) <= 0
+          sum without(type) (rate(prometheus_tsdb_head_samples_appended_total{job="prometheus-kube-prometheus-prometheus",namespace="vynil-monitor"}[5m])) <= 0
        and
          (
            sum without(scrape_job) (prometheus_target_metadata_cache_entries{job="prometheus-kube-prometheus-prometheus",namespace="vynil-monitor"}) > 0
--- a/monitor/prometheus/monitoring.coreos.com_v1_ServiceMonitor_prometheus-kube-prometheus-coredns.yaml
+++ b/monitor/prometheus/monitoring.coreos.com_v1_ServiceMonitor_prometheus-kube-prometheus-coredns.yaml
@@ -9,9 +9,9 @@ metadata:
    
    app.kubernetes.io/managed-by: Helm
    app.kubernetes.io/instance: prometheus
-    app.kubernetes.io/version: "56.2.0"
+    app.kubernetes.io/version: "56.9.0"
    app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.2.0
+    chart: kube-prometheus-stack-56.9.0
    release: "prometheus"
    heritage: "Helm"
 spec:
--- a/monitor/prometheus/monitoring.coreos.com_v1_ServiceMonitor_prometheus-kube-prometheus-kube-proxy.yaml
+++ b/monitor/prometheus/monitoring.coreos.com_v1_ServiceMonitor_prometheus-kube-prometheus-kube-proxy.yaml
@@ -9,9 +9,9 @@ metadata:
    
    app.kubernetes.io/managed-by: Helm
    app.kubernetes.io/instance: prometheus
-    app.kubernetes.io/version: "56.2.0"
+    app.kubernetes.io/version: "56.9.0"
    app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.2.0
+    chart: kube-prometheus-stack-56.9.0
    release: "prometheus"
    heritage: "Helm"
 spec:
--- a/monitor/prometheus/monitoring.coreos.com_v1_ServiceMonitor_prometheus-kube-prometheus-kubelet.yaml
+++ b/monitor/prometheus/monitoring.coreos.com_v1_ServiceMonitor_prometheus-kube-prometheus-kubelet.yaml
@@ -8,9 +8,9 @@ metadata:
    app: kube-prometheus-stack-kubelet    
    app.kubernetes.io/managed-by: Helm
    app.kubernetes.io/instance: prometheus
-    app.kubernetes.io/version: "56.2.0"
+    app.kubernetes.io/version: "56.9.0"
    app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.2.0
+    chart: kube-prometheus-stack-56.9.0
    release: "prometheus"
    heritage: "Helm"
 spec:
--- a/monitor/prometheus/monitoring.coreos.com_v1_ServiceMonitor_prometheus-kube-prometheus-prometheus.yaml
+++ b/monitor/prometheus/monitoring.coreos.com_v1_ServiceMonitor_prometheus-kube-prometheus-prometheus.yaml
@@ -9,9 +9,9 @@ metadata:
    
    app.kubernetes.io/managed-by: Helm
    app.kubernetes.io/instance: prometheus
-    app.kubernetes.io/version: "56.2.0"
+    app.kubernetes.io/version: "56.9.0"
    app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.2.0
+    chart: kube-prometheus-stack-56.9.0
    release: "prometheus"
    heritage: "Helm"
 spec:
--- a/monitor/prometheus/rbac.authorization.k8s.io_v1_ClusterRoleBinding_prometheus-kube-prometheus-prometheus.yaml
+++ b/monitor/prometheus/rbac.authorization.k8s.io_v1_ClusterRoleBinding_prometheus-kube-prometheus-prometheus.yaml
@@ -8,9 +8,9 @@ metadata:
    
    app.kubernetes.io/managed-by: Helm
    app.kubernetes.io/instance: prometheus
-    app.kubernetes.io/version: "56.2.0"
+    app.kubernetes.io/version: "56.9.0"
    app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.2.0
+    chart: kube-prometheus-stack-56.9.0
    release: "prometheus"
    heritage: "Helm"
 roleRef:
--- a/monitor/prometheus/rbac.authorization.k8s.io_v1_ClusterRole_prometheus-kube-prometheus-prometheus.yaml
+++ b/monitor/prometheus/rbac.authorization.k8s.io_v1_ClusterRole_prometheus-kube-prometheus-prometheus.yaml
@@ -8,9 +8,9 @@ metadata:
    
    app.kubernetes.io/managed-by: Helm
    app.kubernetes.io/instance: prometheus
-    app.kubernetes.io/version: "56.2.0"
+    app.kubernetes.io/version: "56.9.0"
    app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.2.0
+    chart: kube-prometheus-stack-56.9.0
    release: "prometheus"
    heritage: "Helm"
 rules:
--- a/monitor/prometheus/v1_ConfigMap_prometheus-kube-prometheus-grafana-datasource.yaml
+++ b/monitor/prometheus/v1_ConfigMap_prometheus-kube-prometheus-grafana-datasource.yaml
@@ -10,9 +10,9 @@ metadata:
    
    app.kubernetes.io/managed-by: Helm
    app.kubernetes.io/instance: prometheus
-    app.kubernetes.io/version: "56.2.0"
+    app.kubernetes.io/version: "56.9.0"
    app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.2.0
+    chart: kube-prometheus-stack-56.9.0
    release: "prometheus"
    heritage: "Helm"
 data:
--- a/monitor/prometheus/v1_ConfigMap_prometheus-kube-prometheus-k8s-coredns.yaml
+++ b/monitor/prometheus/v1_ConfigMap_prometheus-kube-prometheus-k8s-coredns.yaml
@@ -12,9 +12,9 @@ metadata:
    
    app.kubernetes.io/managed-by: Helm
    app.kubernetes.io/instance: prometheus
-    app.kubernetes.io/version: "56.2.0"
+    app.kubernetes.io/version: "56.9.0"
    app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.2.0
+    chart: kube-prometheus-stack-56.9.0
    release: "prometheus"
    heritage: "Helm"
 data:
--- a/monitor/prometheus/v1_ConfigMap_prometheus-kube-prometheus-kubelet.yaml
+++ b/monitor/prometheus/v1_ConfigMap_prometheus-kube-prometheus-kubelet.yaml
@@ -12,9 +12,9 @@ metadata:
    
    app.kubernetes.io/managed-by: Helm
    app.kubernetes.io/instance: prometheus
-    app.kubernetes.io/version: "56.2.0"
+    app.kubernetes.io/version: "56.9.0"
    app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.2.0
+    chart: kube-prometheus-stack-56.9.0
    release: "prometheus"
    heritage: "Helm"
 data:
--- a/monitor/prometheus/v1_ConfigMap_prometheus-kube-prometheus-prometheus.yaml
+++ b/monitor/prometheus/v1_ConfigMap_prometheus-kube-prometheus-prometheus.yaml
@@ -12,9 +12,9 @@ metadata:
    
    app.kubernetes.io/managed-by: Helm
    app.kubernetes.io/instance: prometheus
-    app.kubernetes.io/version: "56.2.0"
+    app.kubernetes.io/version: "56.9.0"
    app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.2.0
+    chart: kube-prometheus-stack-56.9.0
    release: "prometheus"
    heritage: "Helm"
 data:
--- a/monitor/prometheus/v1_ConfigMap_prometheus-kube-prometheus-proxy.yaml
+++ b/monitor/prometheus/v1_ConfigMap_prometheus-kube-prometheus-proxy.yaml
@@ -12,9 +12,9 @@ metadata:
    
    app.kubernetes.io/managed-by: Helm
    app.kubernetes.io/instance: prometheus
-    app.kubernetes.io/version: "56.2.0"
+    app.kubernetes.io/version: "56.9.0"
    app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.2.0
+    chart: kube-prometheus-stack-56.9.0
    release: "prometheus"
    heritage: "Helm"
 data:
--- a/monitor/prometheus/v1_Secret_prometheus-kube-prometheus-prometheus.yaml
+++ b/monitor/prometheus/v1_Secret_prometheus-kube-prometheus-prometheus.yaml
@@ -10,9 +10,9 @@ metadata:
    
    app.kubernetes.io/managed-by: Helm
    app.kubernetes.io/instance: prometheus
-    app.kubernetes.io/version: "56.2.0"
+    app.kubernetes.io/version: "56.9.0"
    app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.2.0
+    chart: kube-prometheus-stack-56.9.0
    release: "prometheus"
    heritage: "Helm"
 data:
--- a/monitor/prometheus/v1_ServiceAccount_prometheus-kube-prometheus-prometheus.yaml
+++ b/monitor/prometheus/v1_ServiceAccount_prometheus-kube-prometheus-prometheus.yaml
@@ -12,8 +12,8 @@ metadata:
    
    app.kubernetes.io/managed-by: Helm
    app.kubernetes.io/instance: prometheus
-    app.kubernetes.io/version: "56.2.0"
+    app.kubernetes.io/version: "56.9.0"
    app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.2.0
+    chart: kube-prometheus-stack-56.9.0
    release: "prometheus"
    heritage: "Helm"
--- a/monitor/prometheus/v1_Service_prometheus-kube-prometheus-coredns.yaml
+++ b/monitor/prometheus/v1_Service_prometheus-kube-prometheus-coredns.yaml
@@ -9,9 +9,9 @@ metadata:
    
    app.kubernetes.io/managed-by: Helm
    app.kubernetes.io/instance: prometheus
-    app.kubernetes.io/version: "56.2.0"
+    app.kubernetes.io/version: "56.9.0"
    app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.2.0
+    chart: kube-prometheus-stack-56.9.0
    release: "prometheus"
    heritage: "Helm"
  namespace: kube-system
--- a/monitor/prometheus/v1_Service_prometheus-kube-prometheus-kube-proxy.yaml
+++ b/monitor/prometheus/v1_Service_prometheus-kube-prometheus-kube-proxy.yaml
@@ -9,9 +9,9 @@ metadata:
    
    app.kubernetes.io/managed-by: Helm
    app.kubernetes.io/instance: prometheus
-    app.kubernetes.io/version: "56.2.0"
+    app.kubernetes.io/version: "56.9.0"
    app.kubernetes.io/part-of: kube-prometheus-stack
-    chart: kube-prometheus-stack-56.2.0
+    chart: kube-prometheus-stack-56.9.0
    release: "prometheus"
    heritage: "Helm"
  namespace: kube-system