megre(addons): megre upstream

Author: EamonZhang

addons/index.yaml

@@ -56,4 +56,7 @@ entries:
       description: "Percona Monitoring and Management: an open source database monitoring, observability and management tool ."
   mongodb: 
     - version: 7.0
-      description: "MongoDB is a document database designed for ease of application development and scaling."
+      description: "MongoDB is a document database designed for ease of application development and scaling."
+  clickhouse: 
+    - version: 24
+      description: "ClickHouse is the fastest and most resource efficient open-source database for real-time apps and analytics."

addons/mongodb/7.0/chart/mongodb/templates/hidden/statefulset.yaml

@@ -393,7 +393,7 @@ spec:
           {{- else }}
           args:
             - |
-              /bin/mongodb_exporter --mongodb.uri "{{ include "mongodb.mongodb_exporter.uri" . }}" {{ .Values.metrics.extraFlags }}
+              mongodb_exporter --mongodb.uri "{{ include "mongodb.mongodb_exporter.uri" . }}" {{ .Values.metrics.extraFlags }}
           {{- end }}
           env:
             {{- if .Values.auth.enabled }}

addons/mongodb/7.0/chart/mongodb/templates/networkpolicy.yaml

@@ -21,6 +21,7 @@ spec:
     # Allow inbound connections
     - ports:
       - port: {{ .Values.service.ports.mongodb }}
+      - port: {{ .Values.metrics.service.ports.metrics }}
     {{- if or .Values.networkPolicy.allowCurrentNamespace .Values.networkPolicy.allowNamespaces }}
       from:
       {{- if .Values.networkPolicy.allowCurrentNamespace }}

addons/mongodb/7.0/chart/mongodb/templates/replicaset/statefulset.yaml

@@ -403,7 +403,7 @@ spec:
           {{- else }}
           args:
             - |
-              /bin/mongodb_exporter --collect-all --compatible-mode --web.listen-address ":{{ .Values.metrics.containerPort }}" --mongodb.uri "{{ include "mongodb.mongodb_exporter.uri" . }}" {{ .Values.metrics.extraFlags }}
+              mongodb_exporter --collect-all --compatible-mode --web.listen-address ":{{ .Values.metrics.containerPort }}" --mongodb.uri "{{ include "mongodb.mongodb_exporter.uri" . }}" {{ .Values.metrics.extraFlags }}
           {{- end }}
           env:
             {{- if .Values.auth.enabled }}

addons/mongodb/7.0/chart/mongodb/templates/standalone/dep-sts.yaml

@@ -341,7 +341,7 @@ spec:
           {{- else }}
           args:
             - |
-              /bin/mongodb_exporter --collect-all --compatible-mode --web.listen-address ":{{ .Values.metrics.containerPort }}" --mongodb.uri "{{ include "mongodb.mongodb_exporter.uri" . }}" {{ .Values.metrics.extraFlags }}
+              mongodb_exporter --collect-all --compatible-mode --web.listen-address ":{{ .Values.metrics.containerPort }}" --mongodb.uri "{{ include "mongodb.mongodb_exporter.uri" . }}" {{ .Values.metrics.extraFlags }}
           {{- end }}
           env:
             {{- if .Values.auth.enabled }}

addons/mongodb/7.0/chart/mongodb/values.yaml

@@ -1822,7 +1822,7 @@ hidden:
 metrics:
   ## @param metrics.enabled Enable using a sidecar Prometheus exporter
   ##
-  enabled: false
+  enabled: true
   ## Drycc MongoDB(®) Promtheus Exporter image
   ## ref: https://hub.docker.com/r/drycc/mongodb-exporter/tags/
   ## @param metrics.image.registry MongoDB(®) Prometheus exporter image registry
@@ -1833,9 +1833,9 @@ metrics:
   ## @param metrics.image.pullSecrets Specify docker-registry secret names as an array
   ##
   image:
-    registry: docker.io
-    repository: drycc/mongodb-exporter
-    tag: 0.34.0-debian-11-r19
+    registry: registry.drycc.cc
+    repository: drycc-addons/mongodb-exporter
+    tag: 0
     digest: ""
     pullPolicy: IfNotPresent
     ## Optionally specify an array of imagePullSecrets.

addons/prometheus/2/chart/prometheus/templates/networkpolicy.yaml

@@ -46,10 +46,6 @@ spec:
       {{- end }}
   {{- end }}  
   {{- end }}
-<<<<<<< HEAD
-=======
-  {{- end }}
->>>>>>> 453a91857971275fb746127d5c3d9100c3c8215c
   {{- if eq .Values.server.service.type "LoadBalancer" }}
   ingress:
     - {}

addons/prometheus/2/meta.yaml

@@ -30,24 +30,12 @@ allow_parameters:
 - name: "server.password"
   required: false
   description: "prometheus administor password"
-<<<<<<< HEAD
 - name: "containerScrape"
   required: false
   description: "container scrape"
 - name: "extraScrapeConfigs"
   required: false
   description: "extra scrape configs"
-=======
-- name: "drycc.token"
-  required: false
-  description: "drycc user token"
-- name: "drycc.url"
-  required: false
-  description: "drycc url"
-- name: "drycc.scheme"
-  required: false
-  description: "drycc scheme"
->>>>>>> 453a91857971275fb746127d5c3d9100c3c8215c
 - name: "server.rules"
   required: false
   description: "rules config for values.yaml"