diff --git a/prometheus/roles/conf/.extend.yml.swp b/prometheus/roles/conf/.extend.yml.swp deleted file mode 100644 index a60f922..0000000 Binary files a/prometheus/roles/conf/.extend.yml.swp and /dev/null differ diff --git a/prometheus/roles/conf/extend.yml b/prometheus/roles/conf/extend.yml index d90bb67..94f36bb 100644 --- a/prometheus/roles/conf/extend.yml +++ b/prometheus/roles/conf/extend.yml @@ -5,7 +5,7 @@ base_dir: /opt # Docker 配置 docker: ## Docker Engine 安装包名称 - package: docker-24.0.7.tgz + package: docker-26.1.1.tgz ## Docker 部署目录 dir: ### 主目录 @@ -22,7 +22,7 @@ docker: # Prometheus Server 配置 prometheus: ## 镜像 - image: prom/prometheus:v2.48.0 + image: prom/prometheus:v2.51.2 ## 部署目录 dir: ### 主目录 @@ -41,7 +41,7 @@ grafana: ## 是否部署 Grafana enable: true ## 镜像 - image: grafana/grafana:10.2.2 + image: grafana/grafana:10.4.2 ## 部署目录 dir: ### 主目录 @@ -58,7 +58,7 @@ alertmanager: ## 是否部署 Alertmanager enable: true ## 镜像 - image: prom/alertmanager:v0.26.0 + image: prom/alertmanager:v0.27.0 ## 部署目录 dir: ### 主目录 @@ -132,7 +132,7 @@ loki: ## 是否启用 Loki enable: true ## 镜像 - image: grafana/loki:2.9.2 + image: grafana/loki:3.0.0 ## 部署目录 dir: ### 主目录 @@ -147,7 +147,7 @@ node_exporter: ## 是否启用 Node Exporter enable: true ## 镜像 - image: prom/node-exporter:v1.7.0 + image: prom/node-exporter:v1.8.0 ## 部署目录 dir: '{{ base_dir }}/exporter/node-exporter' ## 端口号 @@ -169,7 +169,7 @@ blackbox_exporter: ## 是否启用 Blackbox Exporter enable: true ## 镜像 - image: prom/blackbox-exporter:v0.24.0 + image: prom/blackbox-exporter:v0.25.0 ## 部署目录 dir: ### 主目录 @@ -188,7 +188,7 @@ blackbox_exporter: # Mysqld Exporter 配置 mysqld_exporter: ## 镜像 - image: prom/mysqld-exporter:v0.15.0 + image: prom/mysqld-exporter:v0.15.1 ## 部署目录 dir: '{{ base_dir }}/exporter/mysqld-exporter' ## 采集节点 @@ -233,7 +233,7 @@ mongodb_exporter: # Redis Exporter 配置 redis_exporter: ## 镜像 - image: oliver006/redis_exporter:v1.55.0 + image: oliver006/redis_exporter:v1.59.0 ## 部署目录 dir: '{{ base_dir }}/exporter/redis-exporter' ## 采集节点 @@ -254,7 +254,7 @@ redis_exporter: # Rabbitmq Exporter 配置 rabbitmq_exporter: ## 镜像 - image: kbudde/rabbitmq-exporter:1.0.0-RC19 + image: kbudde/rabbitmq-exporter:1.0.0-RC22 ## 部署目录 dir: '{{ base_dir }}/exporter/rabbitmq-exporter' ## 采集节点 @@ -278,7 +278,7 @@ rabbitmq_exporter: # Rocketmq Exporter 配置 rocketmq_exporter: ## 镜像 - image: bitnami/java:1.8.392-9 + image: bitnami/java:1.8.412-9 ## jar 包名称 jar: rocketmq-exporter-0.0.2-SNAPSHOT.jar ## 部署目录 @@ -301,7 +301,7 @@ rocketmq_exporter: # Elasticsearch Exporter 配置 elasticsearch_exporter: ## 镜像 - image: prometheuscommunity/elasticsearch-exporter:v1.6.0 + image: prometheuscommunity/elasticsearch-exporter:v1.7.0 ## 部署目录 dir: '{{ base_dir }}/exporter/elasticsearch-exporter' ## 采集节点 @@ -339,7 +339,7 @@ jmx_exporter: ## 运行模式( javaagent:Java Agent 模式运行;httpserver:HTTP Server 模式运行) model: httpserver ## 镜像 - image: bitnami/java:1.8.392-9 + image: bitnami/java:1.8.412-9 ## jar 包名称 jar: jmx_prometheus_httpserver-0.17.2.jar ## 部署目录 @@ -363,7 +363,7 @@ jmx_exporter: # Nginx Prometheus Exporter 配置 nginx_prometheus_exporter: ## 镜像 - image: nginx/nginx-prometheus-exporter:0.11.0 + image: nginx/nginx-prometheus-exporter:1.1.0 ## 部署目录 dir: '{{ base_dir }}/exporter/nginx-prometheus-exporter' ## 采集节点 @@ -381,7 +381,7 @@ nginx_prometheus_exporter: # Promtail 配置 promtail: ## 镜像 - image: grafana/promtail:2.9.2 + image: grafana/promtail:3.0.0 ## 部署目录 dir: ### 主目录 diff --git a/prometheus/roles/docker/files/x86_64/docker-24.0.7.tgz b/prometheus/roles/docker/files/aarch64/docker-26.1.1.tgz similarity index 81% rename from prometheus/roles/docker/files/x86_64/docker-24.0.7.tgz rename to prometheus/roles/docker/files/aarch64/docker-26.1.1.tgz index d724d56..39cddd8 100644 Binary files a/prometheus/roles/docker/files/x86_64/docker-24.0.7.tgz and b/prometheus/roles/docker/files/aarch64/docker-26.1.1.tgz differ diff --git a/prometheus/roles/docker/files/aarch64/docker-compose b/prometheus/roles/docker/files/aarch64/docker-compose index 44d4a03..6ca4677 100755 Binary files a/prometheus/roles/docker/files/aarch64/docker-compose and b/prometheus/roles/docker/files/aarch64/docker-compose differ diff --git a/prometheus/roles/docker/files/aarch64/docker-24.0.7.tgz b/prometheus/roles/docker/files/x86_64/docker-26.1.1.tgz similarity index 76% rename from prometheus/roles/docker/files/aarch64/docker-24.0.7.tgz rename to prometheus/roles/docker/files/x86_64/docker-26.1.1.tgz index 1647d5b..e52cbb7 100644 Binary files a/prometheus/roles/docker/files/aarch64/docker-24.0.7.tgz and b/prometheus/roles/docker/files/x86_64/docker-26.1.1.tgz differ diff --git a/prometheus/roles/docker/files/x86_64/docker-compose b/prometheus/roles/docker/files/x86_64/docker-compose index bf829e0..e1d73d7 100755 Binary files a/prometheus/roles/docker/files/x86_64/docker-compose and b/prometheus/roles/docker/files/x86_64/docker-compose differ