PMM-2182 Prometheus 2

.gitmodules

@@ -33,7 +33,7 @@
 [submodule "pmm-managed"]
 	path = sources/pmm-managed/src/github.com/percona/pmm-managed
 	url = https://github.com/percona/pmm-managed
-	branch = master
+	branch = PMM-2182-prometheus-2
 [submodule "qan-api"]
 	path = sources/qan-api/src/github.com/percona/qan-api
 	url = https://github.com/percona/qan-api
@@ -49,15 +49,15 @@
 [submodule "pmm-server"]
 	path = sources/pmm-server
 	url = https://github.com/percona/pmm-server
-	branch = master
+	branch = prometheus_2
 [submodule "pmm-server-packaging"]
 	path = sources/pmm-server-packaging
 	url = https://github.com/percona/pmm-server-packaging
-	branch = master
+	branch = prometheus2
 [submodule "grafana-dashboards"]
 	path = sources/grafana-dashboards
 	url = https://github.com/percona/grafana-dashboards
-	branch = master
+	branch = PMM-2552-Dashboards-update-for-Prom2-version
 [submodule "rds_exporter"]
 	path = sources/rds_exporter/src/github.com/percona/rds_exporter
 	url = https://github.com/percona/rds_exporter

Jenkinsfile

@@ -88,6 +88,7 @@ pipeline {
                             build-server-rpm orchestrator
                             build-server-rpm rds_exporter
                             build-server-rpm prometheus
+                            build-server-rpm prometheus1
                             build-server-rpm grafana
                         "
                     '''

build/bin/build-server

@@ -26,6 +26,7 @@ ${bin_dir}/build-server-rpm consul
 ${bin_dir}/build-server-rpm orchestrator
 ${bin_dir}/build-server-rpm rds_exporter
 ${bin_dir}/build-server-rpm prometheus
+${bin_dir}/build-server-rpm prometheus1
 ${bin_dir}/build-server-rpm grafana
 
 ${bin_dir}/build-server-docker

build/pmm-server-docker/playbook-init.yml

@@ -170,6 +170,7 @@
         - /var/log/node_exporter.log
         - /var/log/orchestrator.log
         - /var/log/prometheus.log
+        - /var/log/prometheus1.log
         - /var/log/qan-api.log
         - /var/log/yum.log
         - /var/log/grafana/grafana.log

build/pmm-server-docker/playbook-install.yml

@@ -134,6 +134,7 @@
         - percona-consul
         - percona-grafana
         - percona-prometheus
+        - percona-prometheus1
         - percona-orchestrator
         - percona-qan-api
         - percona-qan-app