Merge branch 'master' into memcached_exporter_0_13_0

lest · Oct 4, 2023 · 3fa7eb2 · 3fa7eb2
2 parents 92b9c29 + d3dc221
commit 3fa7eb2
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 39 deletions.
diff --git a/templating.yaml b/templating.yaml
@@ -15,14 +15,14 @@ anchors:
       release: 1
       service_opts: []
       environment: {}
-      #additional_sources:
-      #  - path: example.yml
-      #    from_tarball: false # take file from tarball or repository
-      #    dest: '%{_sysconfdir}/prometheus/example.yml'
-      #    mode: 644           # optional
-      #    user: root          # optional
-      #    group: root         # optional
-      #    config: true        # specify not to override config files
+      # additional_sources:
+      #   - path: example.yml
+      #     from_tarball: false # take file from tarball or repository
+      #     dest: '%{_sysconfdir}/prometheus/example.yml'
+      #     mode: 644           # optional
+      #     user: root          # optional
+      #     group: root         # optional
+      #     config: true        # specify not to override config files
       prep_cmds: []
       build_cmds:
         - /bin/true
@@ -31,7 +31,7 @@ anchors:
       post_cmds: []
       preun_cmds: []
       postun_cmds: []
-      #open_file_limit: 4096   # optionally specify open file limit
+      # open_file_limit: 4096   # optionally specify open file limit
     dynamic: &default_dynamic_context
       tarball: '{{URL}}/releases/download/v%{version}/{{package}}.tar.gz'
       sources:
@@ -80,11 +80,10 @@ packages:
       <<: *default_context
       static:
         <<: *default_static_context
-        version: 1.5.0
+        version: 1.6.0
         license: ASL 2.0
         URL: https://github.com/prometheus/node_exporter
-        summary: Prometheus exporter for machine metrics, written in Go with pluggable
-          metric collectors.
+        summary: Prometheus exporter for machine metrics, written in Go with pluggable metric collectors.
         description: |
           Prometheus exporter for hardware and OS metrics exposed by *NIX kernels,
           written in Go with pluggable metric collectors.
@@ -95,7 +94,7 @@ packages:
       <<: *default_context
       static:
         <<: *default_static_context
-        version: 0.23.0
+        version: 0.24.0
         license: ASL 2.0
         URL: https://github.com/prometheus/blackbox_exporter
         service_opts:
@@ -149,7 +148,7 @@ packages:
       <<: *default_context
       static:
         <<: *default_static_context
-        version: 0.21.0
+        version: 0.22.0
         license: ASL 2.0
         URL: https://github.com/prometheus/snmp_exporter
         service_opts:
@@ -186,7 +185,7 @@ packages:
       <<: *default_context
       static:
         <<: *default_static_context
-        version: 0.12.0
+        version: 0.13.2
         license: ASL 2.0
         URL: https://github.com/prometheus-community/postgres_exporter
         user: postgres
@@ -224,7 +223,7 @@ packages:
       <<: *default_context
       static:
         <<: *default_static_context
-        version: 1.5.0
+        version: 1.6.0
         license: ASL 2.0
         URL: https://github.com/prometheus-community/elasticsearch_exporter
         service_opts:
@@ -241,8 +240,7 @@ packages:
         version: 1.50.0
         license: MIT
         summary: Prometheus exporter for Redis server metrics.
-        description: Prometheus Exporter for Redis Metrics. Supports Redis 2.x, 3.x,
-          4.x, 5.x and 6.x
+        description: Prometheus Exporter for Redis Metrics. Supports Redis 2.x, 3.x, 4.x, 5.x and 6.x
         package: '%{name}-v%{version}.linux-amd64'
         URL: https://github.com/oliver006/redis_exporter
       dynamic:
@@ -259,18 +257,16 @@ packages:
         URL: https://github.com/prometheus/haproxy_exporter
         service_opts:
           - --haproxy.scrape-uri=unix:/var/lib/haproxy/stats
-        summary: This is a simple server that scrapes HAProxy stats and exports them
-          via HTTP for Prometheus consumption.
-        description: This is a simple server that scrapes HAProxy stats and exports
-          them via HTTP for Prometheus consumption.
+        summary: This is a simple server that scrapes HAProxy stats and exports them via HTTP for Prometheus consumption.
+        description: This is a simple server that scrapes HAProxy stats and exports them via HTTP for Prometheus consumption.
   kafka_exporter:
     build_steps:
       <<: *default_build_steps
     context:
       <<: *default_context
       static:
         <<: *default_static_context
-        version: 1.6.0
+        version: 1.7.0
         license: ASL 2.0
         URL: https://github.com/danielqsj/kafka_exporter
         summary: Kafka exporter for Prometheus.
@@ -368,7 +364,7 @@ packages:
       <<: *default_context
       static:
         <<: *default_static_context
-        version: 1.5.1
+        version: 1.6.0
         license: ASL 2.0
         URL: https://github.com/prometheus/pushgateway
         summary: Prometheus push acceptor for ephemeral and batch jobs.
@@ -412,26 +408,23 @@ packages:
       <<: *default_context
       static:
         <<: *default_static_context
-        version: 2.37.0
+        version: 0.37.0
         license: ASL 2.0
         URL: https://github.com/percona/mongodb_exporter
         package: '%{name}-%{version}.linux-amd64'
-        summary: A Prometheus exporter for MongoDB including sharding, replication
-          and storage engines
-        description: A Prometheus exporter for MongoDB including sharding, replication
-          and storage engines
+        summary: A Prometheus exporter for MongoDB including sharding, replication and storage engines
+        description: A Prometheus exporter for MongoDB including sharding, replication and storage engines
   graphite_exporter:
     build_steps:
       <<: *default_build_steps
     context:
       <<: *default_context
       static:
         <<: *default_static_context
-        version: 0.13.3
+        version: 0.14.0
         license: ASL 2.0
         URL: https://github.com/prometheus/graphite_exporter
-        summary: Server that accepts metrics via the Graphite protocol and exports
-          them as Prometheus metrics.
+        summary: Server that accepts metrics via the Graphite protocol and exports them as Prometheus metrics.
         description: |
           An exporter for metrics exported in the Graphite plaintext protocol. It
           accepts data over both TCP and UDP, and transforms and exposes them for
@@ -807,8 +800,7 @@ packages:
         fix_name: php-fpm_exporter
         service_opts:
           - server
-        summary: A prometheus exporter for PHP-FPM. The exporter connects directly
-          to PHP-FPM and exports the metrics via HTTP
+        summary: A prometheus exporter for PHP-FPM. The exporter connects directly to PHP-FPM and exports the metrics via HTTP
         description: |
           A prometheus exporter for PHP-FPM
   ipmi_exporter:
@@ -942,18 +934,15 @@ packages:
       <<: *default_context
       static:
         <<: *default_static_context
-        version: 1.5.0
+        version: 1.6.1
         license: MIT
         URL: https://github.com/gvengel/exim_exporter
         user: exim
-        package: exim_exporter
+        package: '%{name}_%{version}_linux_amd64'
         tarball_has_subdirectory: false
         summary: Prometheus exporter for the exim4 mail server.
         description: |
           Prometheus exporter for the exim4 mail server.
-      dynamic:
-        <<: *default_dynamic_context
-        tarball: '{{URL}}/releases/download/v%{version}/{{package}}'
   systemd_exporter:
     build_steps:
       <<: *default_build_steps

diff --git a/update_templating_versions.py b/update_templating_versions.py
@@ -108,6 +108,7 @@ def updateGHTemplate(
     formatted_template = io.BytesIO()
     yaml.explicit_start = True
     yaml.indent(sequence=4, offset=2)
+    yaml.width = 500
     yaml.dump(template, formatted_template)
 
     # get existing file checksum: