Skip to content
This repository has been archived by the owner on Jun 24, 2021. It is now read-only.

Modify the version of ansible, grafana, and promethues #720

Merged
merged 1 commit into from
Apr 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ansible>=2.4.2,<2.7.0
ansible==2.5.14
jinja2>=2.9.6
jmespath>=0.9.0
4 changes: 2 additions & 2 deletions roles/grafana/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ grafana_api_keys:

grafana_exec_vars_only: false

grafana_version: 4.6.3
grafana_version: 5.4.3

# docker settings
grafana_tag: 4.6.3
grafana_tag: 5.4.3
16 changes: 8 additions & 8 deletions roles/local/templates/binary_packages.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

third_party_packages:
- name: prometheus
version: 2.2.1
url: "https://github.com/prometheus/prometheus/releases/download/v2.2.1/prometheus-2.2.1.linux-amd64.tar.gz"
version: 2.6.1
url: "https://github.com/prometheus/prometheus/releases/download/v2.6.1/prometheus-2.6.1.linux-amd64.tar.gz"
- name: alertmanager
version: 0.14.0
url: "https://github.com/prometheus/alertmanager/releases/download/v0.14.0/alertmanager-0.14.0.linux-amd64.tar.gz"
Expand All @@ -17,14 +17,14 @@ third_party_packages:
version: 0.4.0
url: "https://github.com/prometheus/pushgateway/releases/download/v0.4.0/pushgateway-0.4.0.linux-amd64.tar.gz"
- name: grafana
version: 4.6.3
url: "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-4.6.3.linux-x64.tar.gz"
version: 5.4.3
url: "https://dl.grafana.com/oss/release/grafana-5.4.3.linux-amd64.tar.gz"


third_party_packages_under_gfw:
- name: prometheus
version: 2.2.1
url: "http://download.pingcap.org/prometheus-2.2.1.linux-amd64.tar.gz"
version: 2.6.1
url: "https://download.pingcap.org/prometheus-2.6.1.linux-amd64.tar.gz"
- name: alertmanager
version: 0.14.0
url: "http://download.pingcap.org/alertmanager-0.14.0.linux-amd64.tar.gz"
Expand All @@ -35,8 +35,8 @@ third_party_packages_under_gfw:
version: 0.4.0
url: "http://download.pingcap.org/pushgateway-0.4.0.linux-amd64.tar.gz"
- name: grafana
version: 4.6.3
url: "http://download.pingcap.org/grafana-4.6.3.linux-x64.tar.gz"
version: 5.4.3
url: "https://download.pingcap.org/grafana-5.4.3.linux-amd64.tar.gz"
- name: blackbox_exporter
version: 0.12.0
url: "http://download.pingcap.org/blackbox_exporter-0.12.0.linux-amd64.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion roles/prometheus/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ prometheus_extra_labels:

alert_label: "promethues"

prometheus_tag: v2.2.1
prometheus_tag: v2.6.1