Merge "Update operations-api stack"
diff --git a/jenkins/client/job/ceph/upgrade.yml b/jenkins/client/job/ceph/upgrade.yml
index 0c07b46..638188e 100644
--- a/jenkins/client/job/ceph/upgrade.yml
+++ b/jenkins/client/job/ceph/upgrade.yml
@@ -73,3 +73,7 @@
type: boolean
default: 'true'
description: Select to copy the disks of Ceph VMs before upgrade and backup Ceph directories on OSD nodes.
+ BACKUP_DIR:
+ type: string
+ default: '/root'
+ description: Select the target dir to backup to when BACKUP_ENABLED
diff --git a/jenkins/client/job/deploy/update/update_glusterfs_cluster_op_version.yml b/jenkins/client/job/deploy/update/update_glusterfs_cluster_op_version.yml
index e35e4fa..24b1217 100644
--- a/jenkins/client/job/deploy/update/update_glusterfs_cluster_op_version.yml
+++ b/jenkins/client/job/deploy/update/update_glusterfs_cluster_op_version.yml
@@ -29,11 +29,9 @@
---
SALT_MASTER_URL: "${_param:jenkins_salt_api_url}"
SALT_MASTER_CREDENTIALS: "salt"
- # Salt compound target to match nodes to be updated [*, G@osfamily:debian].
- TARGET_SERVERS: "I@glusterfs:server:role:primary"
# GlusterFS cluster.op-verion option to set. Leave it empty to get proper version from cluster.max-op-version if available.
CLUSTER_OP_VERSION: ''
- # Does not validate that all clients have been updated
- IGNORE_CLIENT_VERSION: false
# Does not validate that all servers have been updated
IGNORE_SERVER_VERSION: false
+ # Does not validate that all clients have been updated
+ IGNORE_CLIENT_VERSION: false
diff --git a/prometheus/elasticsearch_exporter/queries/compute.yml b/prometheus/elasticsearch_exporter/queries/compute.yml
index a17cb7f..d4bd84f 100644
--- a/prometheus/elasticsearch_exporter/queries/compute.yml
+++ b/prometheus/elasticsearch_exporter/queries/compute.yml
@@ -7,30 +7,16 @@
# - compute_instance_event_doc_count{event="example"}
# - compute_instance_event_sum_other_doc_count
# - compute_instance_event_doc_count_error_upper_bound
- # - compute_instance_event_host_doc_count{host="example01",event="example"}
- # - compute_instance_event_host_sum_other_doc_count{event="example"}
- # - compute_instance_event_host_doc_count_error_upper_bound{event="example"}
#
indices: '<notification-{now/d}>'
interval: 600
json: |
{
"size": 0,
- "query": {
- "match_all": {}
- },
"aggs": {
"event": {
"terms": {
"field": "event_type.keyword"
- },
- "aggs": {
- "host": {
- "terms": {
- "field": "Hostname.keyword",
- "min_doc_count": 0
- }
- }
}
}
}
@@ -38,9 +24,9 @@
compute_instance_create_start:
# Produces metrics:
- # - compute_instance_create_start_host_doc_count{host="example01"}
- # - compute_instance_create_start_host_event_sum_other_doc_count
- # - compute_instance_create_start_host_doc_count_error_upper_bound
+ # - compute_instance_create_start_event_doc_count
+ # - compute_instance_create_start_event_sum_other_doc_count
+ # - compute_instance_create_start_event_doc_count_error_upper_bound
# - compute_instance_create_start_hits
# - compute_instance_create_start_took_milliseconds
#
@@ -49,16 +35,12 @@
json: |
{
"size": 0,
- "query": {
- "term": {
- "event_type": "compute.instance.create.start"
- }
- },
"aggs": {
- "host": {
- "terms": {
- "field": "Hostname.keyword",
- "min_doc_count": 0
+ "event": {
+ "filter": {
+ "term": {
+ "event_type.keyword": "compute.instance.create.start"
+ }
}
}
}
@@ -66,9 +48,9 @@
compute_instance_create_end:
# Produces metrics:
- # - compute_instance_create_end_host_doc_count{host="example01"}
- # - compute_instance_create_end_host_event_sum_other_doc_count
- # - compute_instance_create_end_host_doc_count_error_upper_bound
+ # - compute_instance_create_end_event_doc_count
+ # - compute_instance_create_end_event_sum_other_doc_count
+ # - compute_instance_create_end_event_doc_count_error_upper_bound
# - compute_instance_create_end_hits
# - compute_instance_create_end_took_milliseconds
#
@@ -77,16 +59,12 @@
json: |
{
"size": 0,
- "query": {
- "term": {
- "event_type": "compute.instance.create.end"
- }
- },
"aggs": {
- "host": {
- "terms": {
- "field": "Hostname.keyword",
- "min_doc_count": 0
+ "event": {
+ "filter": {
+ "term": {
+ "event_type.keyword": "compute.instance.create.end"
+ }
}
}
}
@@ -94,9 +72,9 @@
compute_instance_create_error:
# Produces metrics:
- # - compute_instance_create_error_host_doc_count{host="example01"}
- # - compute_instance_create_error_host_event_sum_other_doc_count
- # - compute_instance_create_error_host_doc_count_error_upper_bound
+ # - compute_instance_create_error_event_doc_count
+ # - compute_instance_create_error_event_sum_other_doc_count
+ # - compute_instance_create_error_event_doc_count_error_upper_bound
# - compute_instance_create_error_hits
# - compute_instance_create_error_took_milliseconds
#
@@ -105,18 +83,13 @@
json: |
{
"size": 0,
- "query": {
- "term": {
- "event_type": "compute.instance.create.error"
- }
- },
"aggs": {
- "host": {
- "terms": {
- "field": "Hostname.keyword",
- "min_doc_count": 0
+ "event": {
+ "filter": {
+ "term": {
+ "event_type.keyword": "compute.instance.create.error"
+ }
}
}
}
}
-