Merge pull request #60 from 3scale-ops/feat/update-exporters

feat: update exporters
3scale-ops · Nov 19, 2024 · 4beef5c · 4beef5c
2 parents b4e93d9 + 1e541f9
commit 4beef5c
Show file tree

Hide file tree

Showing 18 changed files with 146 additions and 96 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
-
 # Binaries for programs and plugins
 *.exe
 *.exe~
@@ -13,3 +12,6 @@ bin
 *.swo
 *~
 kubeconfig
+
+# tmp folder
+tmp
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@
 # To re-generate a bundle for another specific version without changing the standard setup, you can:
 # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
-VERSION ?= 0.8.2-alpha.1
+VERSION ?= 0.8.2-alpha.2
 
 # CHANNELS define the bundle channels used in the bundle.
 # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")

diff --git a/bundle/manifests/prometheus-exporter-operator.clusterserviceversion.yaml b/bundle/manifests/prometheus-exporter-operator.clusterserviceversion.yaml
@@ -34,7 +34,7 @@ metadata:
     operators.operatorframework.io/project_layout: ansible.sdk.operatorframework.io/v1
     repository: https://github.com/3scale-ops/prometheus-exporter-operator
     support: Red Hat, Inc.
-  name: prometheus-exporter-operator.v0.8.2-alpha.1
+  name: prometheus-exporter-operator.v0.8.2-alpha.2
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -125,7 +125,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
-                image: quay.io/3scale/prometheus-exporter-operator:v0.8.2-alpha.1
+                image: quay.io/3scale/prometheus-exporter-operator:v0.8.2-alpha.2
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -310,4 +310,4 @@ spec:
   provider:
     name: Red Hat
     url: https://www.redhat.com
-  version: 0.8.2-alpha.1
+  version: 0.8.2-alpha.2
diff --git a/catalog/prometheus-exporter-operator/alpha-channel.yaml b/catalog/prometheus-exporter-operator/alpha-channel.yaml
@@ -19,6 +19,8 @@ entries:
     replaces: prometheus-exporter-operator.v0.8.0
   - name: prometheus-exporter-operator.v0.8.2-alpha.1
     replaces: prometheus-exporter-operator.v0.8.1
+  - name: prometheus-exporter-operator.v0.8.2-alpha.2
+    replaces: prometheus-exporter-operator.v0.8.2-alpha.1
 name: alpha
 package: prometheus-exporter-operator
 schema: olm.channel
diff --git a/...r-operator/objects/prometheus-exporter-operator.v0.8.2-alpha.2.clusterserviceversion.yaml b/...r-operator/objects/prometheus-exporter-operator.v0.8.2-alpha.2.clusterserviceversion.yaml
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -8,4 +8,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: quay.io/3scale/prometheus-exporter-operator
-  newTag: v0.8.2-alpha.1
+  newTag: v0.8.2-alpha.2
diff --git a/examples/README.md b/examples/README.md
diff --git a/roles/prometheusexporter/exporters/cloudwatch/vars.yml b/roles/prometheusexporter/exporters/cloudwatch/vars.yml
@@ -1,8 +1,7 @@
 ---
-
 # Exporter
 image_name: "prom/cloudwatch-exporter"
-image_version: "cloudwatch_exporter-0.11.0"
+image_version: "v0.16.0"
 port: 9106
 liveness_probe_timeout_seconds: 45
 liveness_probe_period_seconds: 60
@@ -20,7 +19,6 @@ resources_limits_memory: "256Mi"
 # Custom
 aws_credentials_secret_name: "prometheus-exporter-{{ type }}-{{ ansible_operator_meta.name }}"
 configuration_configmap_name: "prometheus-exporter-{{ type }}-{{ ansible_operator_meta.name }}"
-
 ###### Example of Secret
 #
 # If you don't specify CR field awsCredentialsSecretName, it will be used default Secret name "prometheus-exporter-cloudwatch-{{ CR_NAME }}"

diff --git a/roles/prometheusexporter/exporters/es/container.yml.j2 b/roles/prometheusexporter/exporters/es/container.yml.j2
@@ -1,4 +1,3 @@
-command:
-  - "/bin/elasticsearch_exporter"
+args:
   - "--es.uri={{ db_host }}:{{ db_port }}"
   - "--es.all"
diff --git a/roles/prometheusexporter/exporters/es/vars.yml b/roles/prometheusexporter/exporters/es/vars.yml
@@ -1,8 +1,7 @@
 ---
-
 # Exporter
-image_name: "justwatch/elasticsearch_exporter"
-image_version: "1.1.0"
+image_name: "quay.io/prometheuscommunity/elasticsearch-exporter"
+image_version: "v1.8.0"
 port: 9114
 liveness_probe_timeout_seconds: 10
 liveness_probe_period_seconds: 15

diff --git a/roles/prometheusexporter/exporters/manticore/vars.yml b/roles/prometheusexporter/exporters/manticore/vars.yml
@@ -1,8 +1,7 @@
 ---
-
 # Exporter
 image_name: "manticoresearch/prometheus-exporter"
-image_version: "6.2.13.0"
+image_version: "6.3.2.0"
 port: 8081
 liveness_probe_timeout_seconds: 3
 liveness_probe_period_seconds: 15

diff --git a/roles/prometheusexporter/exporters/memcached/vars.yml b/roles/prometheusexporter/exporters/memcached/vars.yml
@@ -1,8 +1,7 @@
 ---
-
 # Exporter
 image_name: "prom/memcached-exporter"
-image_version: "v0.6.0"
+image_version: "v0.15.0"
 port: 9150
 liveness_probe_timeout_seconds: 3
 liveness_probe_period_seconds: 15

diff --git a/roles/prometheusexporter/exporters/mysql/vars.yml b/roles/prometheusexporter/exporters/mysql/vars.yml
@@ -1,8 +1,7 @@
 ---
-
 # Exporter
 image_name: "prom/mysqld-exporter"
-image_version: "v0.12.1"
+image_version: "v0.14.0" # v0.15 and above introduces breaking changes, replacing connection string secret with a .my.cnf based configuration
 port: 9104
 liveness_probe_timeout_seconds: 3
 liveness_probe_period_seconds: 15
@@ -19,7 +18,6 @@ resources_limits_memory: "64Mi"
 
 # Custom
 db_connection_string_secret_name: "prometheus-exporter-{{ type }}-{{ ansible_operator_meta.name }}"
-
 ###### Example of Secret
 #
 # If you don't specify CR field dbConnectionStringSecretName, it will be used default Secret name "prometheus-exporter-mysql-{{ CR_NAME }}"

diff --git a/roles/prometheusexporter/exporters/postgresql/vars.yml b/roles/prometheusexporter/exporters/postgresql/vars.yml
@@ -1,8 +1,7 @@
 ---
-
 # Exporter
-image_name: "wrouesnel/postgres_exporter"
-image_version: "v0.8.0"
+image_name: "quay.io/prometheuscommunity/postgres-exporter"
+image_version: "v0.16.0"
 port: 9187
 liveness_probe_timeout_seconds: 3
 liveness_probe_period_seconds: 15
@@ -19,7 +18,6 @@ resources_limits_memory: "64Mi"
 
 # Custom
 db_connection_string_secret_name: "prometheus-exporter-{{ type }}-{{ ansible_operator_meta.name }}"
-
 ###### Example of Secret
 #
 # If you don't specify CR field dbConnectionStringSecretName, it will be used default Secret name "prometheus-exporter-postgresql-{{ CR_NAME }}"

diff --git a/roles/prometheusexporter/exporters/probe/vars.yml b/roles/prometheusexporter/exporters/probe/vars.yml
@@ -2,7 +2,7 @@
 
 # Exporter
 image_name: "quay.io/prometheus/blackbox-exporter"
-image_version: "v0.22.0"
+image_version: "v0.25.0"
 port: 9115
 liveness_probe_timeout_seconds: 3
 liveness_probe_period_seconds: 15

diff --git a/roles/prometheusexporter/exporters/redis/vars.yml b/roles/prometheusexporter/exporters/redis/vars.yml
@@ -1,8 +1,7 @@
 ---
-
 # Exporter
 image_name: "oliver006/redis_exporter"
-image_version: "v1.44.0"
+image_version: "v1.66.0"
 port: 9121
 liveness_probe_timeout_seconds: 3
 liveness_probe_period_seconds: 15
@@ -20,7 +19,6 @@ resources_limits_memory: "64Mi"
 # Custom
 db_host: "backend-redis"
 db_port: 6379
-
 ## Optional:
 # Example 3scale backend:
 #db_check_keys: "resque:queue:stats,resque:queue:priority,resque:queue:main,resque:failed"

diff --git a/roles/prometheusexporter/exporters/sendgrid/vars.yml b/roles/prometheusexporter/exporters/sendgrid/vars.yml
@@ -1,8 +1,7 @@
 ---
-
 # Exporter
 image_name: "chatwork/sendgrid-stats-exporter"
-image_version: "0.0.9"
+image_version: "v0.0.10"
 port: 9154
 liveness_probe_timeout_seconds: 3
 liveness_probe_period_seconds: 15
@@ -22,7 +21,6 @@ sendgrid_credentials_secret_name: "prometheus-exporter-{{ type }}-{{ ansible_ope
 sendgrid_accumulated_metrics: "True"
 sendgrid_location: ""
 sendgrid_time_offset: "0"
-
 ###### Example of Secret
 #
 # If you don't specify CR field sendgridCredentialsSecretName, it will be used default Secret name "prometheus-exporter-sendgrid-{{ CR_NAME }}"

diff --git a/roles/prometheusexporter/exporters/sphinx/vars.yml b/roles/prometheusexporter/exporters/sphinx/vars.yml
@@ -1,8 +1,7 @@
 ---
-
 # Exporter
 image_name: "foxdalas/sphinx-exporter"
-image_version: "master"
+image_version: "v0.3.0"
 port: 9247
 liveness_probe_timeout_seconds: 3
 liveness_probe_period_seconds: 15