Skip to content

Commit

Permalink
Merge branch 'master' into sha256_rpm_signatures
Browse files Browse the repository at this point in the history
  • Loading branch information
karlism authored Oct 6, 2023
2 parents 0ed9cbe + cf6b375 commit 360ba74
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 32 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Python environment
uses: actions/setup-python@v4
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Ruby environment
uses: ruby/setup-ruby@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check_new_versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup python environment
uses: actions/setup-python@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
# Checkout the code base #
##########################
- name: Checkout Code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
# Full git history is needed to get a proper list of changed files within `super-linter`
fetch-depth: 0
Expand Down
2 changes: 1 addition & 1 deletion prometheus2/prometheus2.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%global debug_package %{nil}

Name: prometheus2
Version: 2.44.0
Version: 2.47.1
Release: 1%{?dist}
Summary: The Prometheus monitoring system and time series database.
License: ASL 2.0
Expand Down
44 changes: 18 additions & 26 deletions templating.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,10 @@ packages:
<<: *default_context
static:
<<: *default_static_context
version: 0.5
version: 0.12.3
release: 1
license: MIT
URL: https://github.com/free/sql_exporter
URL: https://github.com/burningalchemist/sql_exporter
service_opts:
- --config.file=/etc/prometheus/sql_exporter.yml
additional_sources:
Expand All @@ -137,7 +137,7 @@ packages:
group: '%{group}'
summary: SQL exporter
description: |
The Sql_exporter queries the sql database and expose the result to Prometheus.
Database agnostic SQL exporter for Prometheus.
dynamic:
<<: *default_dynamic_context
tarball: '{{URL}}/releases/download/%{version}/{{package}}.tar.gz'
Expand Down Expand Up @@ -185,7 +185,7 @@ packages:
<<: *default_context
static:
<<: *default_static_context
version: 0.13.2
version: 0.14.0
license: ASL 2.0
URL: https://github.com/prometheus-community/postgres_exporter
user: postgres
Expand All @@ -195,8 +195,7 @@ packages:
environment:
DATA_SOURCE_NAME: user=postgres host=/var/run/postgresql/ sslmode=disable
additional_sources:
- path:
https://raw.githubusercontent.com/prometheus-community/%{name}/v%{version}/queries.yaml
- path: https://raw.githubusercontent.com/prometheus-community/%{name}/v%{version}/queries.yaml
dest: '%{_sysconfdir}/prometheus/%{name}_queries.yaml'
from_tarball: false
summary: Prometheus exporter for PostgreSQL server metrics
Expand Down Expand Up @@ -316,8 +315,7 @@ packages:
service_opts:
- --config.file=/etc/prometheus/json_exporter.yml
additional_sources:
- path:
https://raw.githubusercontent.com/prometheus-community/%{name}/v%{version}/examples/config.yml
- path: https://raw.githubusercontent.com/prometheus-community/%{name}/v%{version}/examples/config.yml
dest: '%{_sysconfdir}/prometheus/%{name}.yaml'
from_tarball: false
keepalived_exporter:
Expand Down Expand Up @@ -408,7 +406,7 @@ packages:
<<: *default_context
static:
<<: *default_static_context
version: 0.37.0
version: 0.39.0
license: ASL 2.0
URL: https://github.com/percona/mongodb_exporter
package: '%{name}-%{version}.linux-amd64'
Expand Down Expand Up @@ -623,8 +621,7 @@ packages:
package: process-exporter-%{version}.linux-amd64
fix_name: process-exporter
additional_sources:
- path:
https://raw.githubusercontent.com/ncabatoff/process-exporter/v%{version}/packaging/conf/all.yaml
- path: https://raw.githubusercontent.com/ncabatoff/process-exporter/v%{version}/packaging/conf/all.yaml
dest: '%{_sysconfdir}/prometheus/%{name}.yml'
service_opts:
- --config.path=/etc/prometheus/process_exporter.yml
Expand All @@ -644,8 +641,7 @@ packages:
package: '%{name}_%{version}_linux_amd64'
tarball_has_subdirectory: false
additional_sources:
- path:
https://raw.githubusercontent.com/ribbybibby/%{name}/v%{version}/examples/%{name}.yaml
- path: https://raw.githubusercontent.com/ribbybibby/%{name}/v%{version}/examples/%{name}.yaml
dest: '%{_sysconfdir}/prometheus/%{name}.yml'
service_opts:
- --config.file=/etc/prometheus/ssl_exporter.yml
Expand All @@ -666,8 +662,7 @@ packages:
license: BSD
URL: https://github.com/messagebird/sachet
additional_sources:
- path:
https://raw.githubusercontent.com/messagebird/%{name}/%{version}/examples/config.yaml
- path: https://raw.githubusercontent.com/messagebird/%{name}/%{version}/examples/config.yaml
dest: '%{_sysconfdir}/prometheus/%{name}.yml'
mode: 640
group: '%{group}'
Expand Down Expand Up @@ -723,8 +718,7 @@ packages:
service_opts:
- --config.file=/etc/prometheus/ebpf_exporter.yml
additional_sources:
- path:
https://raw.githubusercontent.com/cloudflare/%{name}/v%{version}/examples/bio.yaml
- path: https://raw.githubusercontent.com/cloudflare/%{name}/v%{version}/examples/bio.yaml
dest: '%{_sysconfdir}/prometheus/%{name}.yml'
from_tarball: false
summary: Prometheus exporter for custom eBPF metrics
Expand All @@ -740,7 +734,7 @@ packages:
<<: *default_context
static:
<<: *default_static_context
version: '0.114'
version: '0.116'
license: ASL 2.0
URL: https://github.com/prymitive/karma
package: '%{name}-linux-amd64'
Expand Down Expand Up @@ -816,8 +810,7 @@ packages:
service_opts:
- --config.file==/etc/prometheus/ipmi.yml
additional_sources:
- path:
https://raw.githubusercontent.com/prometheus-community/%{name}/v%{version}/ipmi_local.yml
- path: https://raw.githubusercontent.com/prometheus-community/%{name}/v%{version}/ipmi_local.yml
dest: '%{_sysconfdir}/prometheus/%{name}.yml'
from_tarball: false
summary: Prometheus exporter for IPMI metrics
Expand All @@ -830,12 +823,12 @@ packages:
<<: *default_context
static:
<<: *default_static_context
version: 0.11.0
version: 0.12.0
license: ASL 2.0
URL: https://github.com/nats-io/prometheus-nats-exporter
package: prometheus-nats-exporter-v%{version}-linux-amd64
tarball_has_subdirectory: true
package: prometheus-nats-exporter-v%{version}-linux-x86_64
fix_name: prometheus-nats-exporter
tarball_has_subdirectory: false
service_opts:
- -varz http://localhost:8222
summary: A prometheus exporter for NATS
Expand All @@ -862,8 +855,7 @@ packages:
dest: '%{_sysconfdir}/prometheus/%{name}.yml'
group: '%{group}'
mode: 640
- path:
https://github.com/prometheus-msteams/prometheus-msteams/releases/download/v%{version}/default-message-card.tmpl
- path: https://github.com/prometheus-msteams/prometheus-msteams/releases/download/v%{version}/default-message-card.tmpl
dest: '%{_sysconfdir}/prometheus/%{name}_message_card.tmpl'
from_tarball: false
summary: Alertmanager to Microsoft Teams gateway
Expand All @@ -879,7 +871,7 @@ packages:
<<: *default_context
static:
<<: *default_static_context
version: 0.47.0
version: 0.47.2
license: ASL 2.0
URL: https://github.com/google/cadvisor
user: root
Expand Down
2 changes: 1 addition & 1 deletion thanos/thanos.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%global debug_package %{nil}

Name: thanos
Version: 0.31.0
Version: 0.32.4
Release: 1%{?dist}
Summary: Highly available Prometheus setup with long term storage capabilities.
License: ASL 2.0
Expand Down

0 comments on commit 360ba74

Please sign in to comment.