Merge "Add braedon/prometheus-es-exporter:0.5.1 mirror" into release/2019.2.0
diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index 3f6769e..35c44a9 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -16,8 +16,8 @@
docker_image_gerrit: "${_param:mcp_docker_registry}/mirantis/cicd/gerrit:${_param:mcp_version}"
# mysql:5.6
docker_image_mysql: "${_param:mcp_docker_registry}/mirantis/cicd/mysql:${_param:mcp_version}"
- # jenkins:2.121.3
- docker_image_jenkins: "${_param:mcp_docker_registry}/mirantis/cicd/jenkins:${_param:mcp_version}"
+ # jenkins:2.150.3
+ docker_image_jenkins: "${_param:mcp_docker_registry}/mirantis/cicd/jenkins:2019.2.3"
docker_image_jenkins_slave: "${_param:mcp_docker_registry}/mirantis/cicd/jnlp-slave:${_param:mcp_version}"
# model-generator
docker_image_operations_api: "${_param:mcp_docker_registry}/mirantis/model-generator/operations-api:${_param:mcp_version}"
@@ -43,7 +43,7 @@
docker_image_keycloak_server: "${_param:mcp_docker_registry}/mirantis/external/jboss/keycloak:4.5.0.Final"
docker_image_keycloak_proxy: "${_param:mcp_docker_registry}/mirantis/external/jboss/keycloak:3.4.2.Final"
# CVP
- docker_image_cvp_sanity_checks: ${_param:mcp_docker_registry}/mirantis/cvp/cvp-sanity-checks:2019.2.1
+ docker_image_cvp_sanity_checks: ${_param:mcp_docker_registry}/mirantis/cvp/cvp-sanity-checks:2019.2.2
# aptly
docker_image_aptly:
base: "${_param:mcp_docker_registry}/mirantis/cicd/aptly:${_param:mcp_version}"
diff --git a/etcd/server/cluster.yml b/etcd/server/cluster.yml
index d9c1c8b..af210d7 100644
--- a/etcd/server/cluster.yml
+++ b/etcd/server/cluster.yml
@@ -4,10 +4,10 @@
- service.etcd.linux
parameters:
_param:
- docker_image_etcd: quay.io/coreos/etcd:v3.3.10
+ docker_image_etcd: quay.io/coreos/etcd:v3.3.12
kubernetes_etcd_repo: https://github.com/etcd-io/etcd/releases/download
- kubernetes_etcd_source: ${_param:kubernetes_etcd_repo}/v3.3.10/etcd-v3.3.10-linux-amd64.tar.gz
- kubernetes_etcd_source_hash: md5=dbbe0d021ba497bf9d9cc9963d0c7a4b
+ kubernetes_etcd_source: ${_param:kubernetes_etcd_repo}/v3.3.12/etcd-v3.3.12-linux-amd64.tar.gz
+ kubernetes_etcd_source_hash: md5=079af00546443b686df31e7ec605135e
etcd:
server:
enabled: true
diff --git a/jenkins/client/job/deploy/galera_verify_restore.yml b/jenkins/client/job/deploy/galera_verify_restore.yml
index 3b9127e..492d76f 100644
--- a/jenkins/client/job/deploy/galera_verify_restore.yml
+++ b/jenkins/client/job/deploy/galera_verify_restore.yml
@@ -25,3 +25,12 @@
SALT_MASTER_URL:
type: string
default: "${_param:jenkins_salt_api_url}"
+ ASK_CONFIRMATION:
+ type: boolean
+ default: 'true'
+ CHECK_TIME_SYNC:
+ type: boolean
+ default: 'true'
+ VERIFICATION_RETRIES:
+ type: string
+ default: 5
diff --git a/jenkins/client/job/deploy/update/kubernetes_update.yml b/jenkins/client/job/deploy/update/kubernetes_update.yml
index 7829b41..454d92b 100644
--- a/jenkins/client/job/deploy/update/kubernetes_update.yml
+++ b/jenkins/client/job/deploy/update/kubernetes_update.yml
@@ -4,8 +4,6 @@
parameters:
_param:
jenkins_salt_api_url: "http://${_param:salt_master_host}:6969"
- kubernetes_hyperkube_repo: ${_param:mcp_docker_registry}/mirantis/kubernetes
- kubernetes_calico_repo: ${_param:mcp_docker_registry}/mirantis/projectcalico/calico
jenkins:
client:
job:
@@ -127,3 +125,11 @@
type: string
default: ""
description: "Versioned calico/kube-controllers image. Should be null if update rolling via reclass-system level"
+ KUBERNETES_ETCD_SOURCE:
+ type: string
+ default: ""
+ description: "Versioned binary for etcd server. Should be null if update rolling via reclass-system level"
+ KUBERNETES_ETCD_SOURCE_HASH:
+ type: string
+ default: ""
+ description: "Checksum of etcd binary. Should be null if update rolling via reclass-system level"
diff --git a/jenkins/client/job/validate.yml b/jenkins/client/job/validate.yml
index b1d9832..961ebf7 100644
--- a/jenkins/client/job/validate.yml
+++ b/jenkins/client/job/validate.yml
@@ -435,15 +435,15 @@
default: "salt"
TESTS_REPO:
type: string
- default: "https://github.com/Mirantis/stacklight-pytest -b cvp_stacklight"
+ default: "http://gerrit.mcp.mirantis.com/mcp/stacklight-pytest -b release/2019.2.0"
description: Url for cvp-stacklight-tests
TESTS_SETTINGS:
type: string
- default: "SL_AUTOCONF=True"
+ default: "SL_AUTOCONF=True;PYTHONPATH=./stacklight-pytest"
description: "Additional environment variables to export"
TESTS_SET:
type: string
- default: "stacklight-pytest/stacklight_tests/tests/prometheus/"
+ default: "stacklight-pytest/stacklight_tests/tests/"
description: "Leave as is for full run or add a filename, e.g. _default_path_/test_dashboards.py"
PROXY:
type: string
diff --git a/kubernetes/common/init.yml b/kubernetes/common/init.yml
index ec9a7ec..731e120 100644
--- a/kubernetes/common/init.yml
+++ b/kubernetes/common/init.yml
@@ -36,9 +36,9 @@
kubernetes_calico_cni_source_hash: md5=2544bc1865c1451cac7a61264c25a2cb
kubernetes_calico_cni_ipam_source: ${_param:kubernetes_calico_cni_repo}/calico-ipam-v3.3.2
kubernetes_calico_cni_ipam_source_hash: md5=b22623eeea3b29ba8ec071d859ac7055
- kubernetes_hyperkube_source: ${_param:kubernetes_hyperkube_repo}/hyperkube_v1.12.4-3_1547129775753
- kubernetes_hyperkube_source_hash: md5=7c50744bdb84fd6fe14ef8a835298f74
- kubernetes_pause_image: ${_param:mcp_docker_registry}/mirantis/kubernetes/pause-amd64:v1.12.4-3
+ kubernetes_hyperkube_source: ${_param:kubernetes_hyperkube_repo}/hyperkube_v1.12.6-5_1551704156632
+ kubernetes_hyperkube_source_hash: md5=ced3e283c3167c551c581047ed9ab71b
+ kubernetes_pause_image: ${_param:mcp_docker_registry}/mirantis/kubernetes/pause-amd64:v1.12.6-5
kubernetes_virtlet_image: ${_param:kubernetes_virtlet_repo}/virtlet:v1.4.4
kubernetes_criproxy_version: v0.14.0
kubernetes_criproxy_checksum: md5=f0fa669295a156a588f3480c9909e6fd
@@ -66,10 +66,10 @@
kubernetes_containerd_source: ${_param:kubernetes_containerd_repo}/v1.12.0/crictl-v1.12.0-linux-amd64.tar.gz
kubernetes_containerd_source_hash: md5=ff60b9ddfa5617f7ed14b3f3b6a60056
# images for formula compatibility
- kubernetes_hyperkube_image: ${_param:mcp_docker_registry}/mirantis/kubernetes/hyperkube-amd64:v1.12.3-2
+ kubernetes_hyperkube_image: ${_param:mcp_docker_registry}/mirantis/kubernetes/hyperkube-amd64:v1.12.6-5
kubernetes_calico_cni_image: ${_param:mcp_docker_registry}/mirantis/projectcalico/calico/cni:v3.3.2
kubernetes_calico_calicoctl_image: ${_param:mcp_docker_registry}/mirantis/projectcalico/calico/ctl:v3.3.2
- kubernetes_containerd_package: containerd.io=1.2.1-1~u16.04+mcp
+ kubernetes_containerd_package: containerd.io=1.2.1+1-1~u16.04+mcp
kubernetes_metrics_server_image: ${_param:kubernetes_metrics_server_repo}/metrics-server-amd64:v0.3.1
kubernetes_opencontrail_controller_image: ${_param:kubernetes_contrail_registry}/opencontrail-controller:${_param:mcp_version}
diff --git a/prometheus/gainsight/query/openstack.yml b/prometheus/gainsight/query/openstack.yml
index 877ad32..40a804b 100644
--- a/prometheus/gainsight/query/openstack.yml
+++ b/prometheus/gainsight/query/openstack.yml
@@ -8,7 +8,7 @@
vstorage_free: "'vStorage Free','avg(sum(avg_over_time(openstack_nova_free_disk[24h])) by (instance))'"
vram_used: "'vRAM Used','avg(sum(avg_over_time(openstack_nova_used_ram[24h])) by (instance))'"
vram_free: "'vRAM Free','avg(sum(avg_over_time(openstack_nova_free_ram[24h])) by (instance))'"
- instances: "'Active Instances','avg(sum(avg_over_time(openstack_nova_instances{state=\"active\"}[24h])) by (instance))'"
+ instances: "'Instances','avg(sum(avg_over_time(openstack_nova_instances{state=\"active\"}[24h])) by (instance))'"
compute_nodes: "'Compute Nodes','avg(sum(openstack_nova_services{binary=~\"nova.compute\"}) by (instance))'"
tenants: "'Tenants','avg(sum(avg_over_time(openstack_keystone_tenants_total[24h])) by (instance))'"
cinder_api: "'Cinder API','avg(avg_over_time(openstack_api_check_status{name=\"cinderv2\"}[24h]))'"