diff --git a/changelogs/unreleased/bjk-bump_monitoring.yml b/changelogs/unreleased/bjk-bump_monitoring.yml new file mode 100644 index 0000000000000000000000000000000000000000..b12cf95876140db21e3f50792168eb23916be338_Y2hhbmdlbG9ncy91bnJlbGVhc2VkL2Jqay1idW1wX21vbml0b3JpbmcueW1s --- /dev/null +++ b/changelogs/unreleased/bjk-bump_monitoring.yml @@ -0,0 +1,5 @@ +--- +title: Bump Prometheus components to the latest +merge_request: 3182 +author: +type: other diff --git a/config/software/alertmanager.rb b/config/software/alertmanager.rb index 6e74cfe45c03b0407f333c19e9a079c164eed1b4_Y29uZmlnL3NvZnR3YXJlL2FsZXJ0bWFuYWdlci5yYg==..b12cf95876140db21e3f50792168eb23916be338_Y29uZmlnL3NvZnR3YXJlL2FsZXJ0bWFuYWdlci5yYg== 100644 --- a/config/software/alertmanager.rb +++ b/config/software/alertmanager.rb @@ -20,7 +20,7 @@ require "#{Omnibus::Config.project_root}/lib/gitlab/prometheus_helper" name 'alertmanager' -version = Gitlab::Version.new('alertmanager', '0.15.1') +version = Gitlab::Version.new('alertmanager', '0.16.2') default_version version.print license 'APACHE-2.0' diff --git a/config/software/grafana.rb b/config/software/grafana.rb index 6e74cfe45c03b0407f333c19e9a079c164eed1b4_Y29uZmlnL3NvZnR3YXJlL2dyYWZhbmEucmI=..b12cf95876140db21e3f50792168eb23916be338_Y29uZmlnL3NvZnR3YXJlL2dyYWZhbmEucmI= 100644 --- a/config/software/grafana.rb +++ b/config/software/grafana.rb @@ -17,7 +17,7 @@ require "#{Omnibus::Config.project_root}/lib/gitlab/version" name 'grafana' -version = Gitlab::Version.new('grafana', '6.0.0') +version = Gitlab::Version.new('grafana', '6.1.1') default_version version.print(false) license 'APACHE-2.0' @@ -26,7 +26,7 @@ skip_transitive_dependency_licensing true source url: "https://dl.grafana.com/oss/release/grafana-#{default_version}.linux-amd64.tar.gz", - sha256: '6497b2acf5e5da9736f2de9f72e2d13795684a74cbbea323ab81fea22a9d8709' + sha256: '5c17e57adc6e48f3c9123062f4bdaef849fb4d978b0a9ff0eb8b7cf147c57835' relative_path "grafana-#{default_version}" diff --git a/config/software/prometheus-2.rb b/config/software/prometheus-2.rb index 6e74cfe45c03b0407f333c19e9a079c164eed1b4_Y29uZmlnL3NvZnR3YXJlL3Byb21ldGhldXMtMi5yYg==..b12cf95876140db21e3f50792168eb23916be338_Y29uZmlnL3NvZnR3YXJlL3Byb21ldGhldXMtMi5yYg== 100644 --- a/config/software/prometheus-2.rb +++ b/config/software/prometheus-2.rb @@ -20,7 +20,7 @@ require "#{Omnibus::Config.project_root}/lib/gitlab/prometheus_helper" name 'prometheus-2' -version = Gitlab::Version.new('prometheus', '2.6.1') +version = Gitlab::Version.new('prometheus', '2.8.1') default_version version.print license 'APACHE-2.0' diff --git a/config/software/redis-exporter.rb b/config/software/redis-exporter.rb index 6e74cfe45c03b0407f333c19e9a079c164eed1b4_Y29uZmlnL3NvZnR3YXJlL3JlZGlzLWV4cG9ydGVyLnJi..b12cf95876140db21e3f50792168eb23916be338_Y29uZmlnL3NvZnR3YXJlL3JlZGlzLWV4cG9ydGVyLnJi 100644 --- a/config/software/redis-exporter.rb +++ b/config/software/redis-exporter.rb @@ -20,7 +20,7 @@ require 'time' name 'redis-exporter' -version = Gitlab::Version.new('redis-exporter', '0.26.0') +version = Gitlab::Version.new('redis-exporter', '0.32.0') default_version version.print license 'MIT' @@ -39,9 +39,6 @@ "-X main.VERSION=#{version.print(false)}" ].join(' ') - command 'go get github.com/Masterminds/glide', env: env - command 'go install github.com/Masterminds/glide', env: env - command '../../../../bin/glide install ', env: env command "go build -ldflags '#{ldflags}'", env: env copy 'redis_exporter', "#{install_dir}/embedded/bin/"