summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAlan Rominger <arominge@redhat.com>2022-09-02 19:38:49 +0200
committerAlan Rominger <arominge@redhat.com>2022-09-02 19:38:49 +0200
commitccbc8ce7de8d81ad034c1616bf63beb411eb96d9 (patch)
treea84126a7aad9aeef73fe5f688d64ac3a5cd24132 /tools
parentMerge pull request #12803 from matburt/fix_cleanup_schedules (diff)
downloadawx-ccbc8ce7de8d81ad034c1616bf63beb411eb96d9.tar.xz
awx-ccbc8ce7de8d81ad034c1616bf63beb411eb96d9.zip
Make the metrics default sampling interval 5s
Diffstat (limited to 'tools')
-rw-r--r--tools/docker-compose/ansible/roles/sources/defaults/main.yml3
-rw-r--r--tools/docker-compose/ansible/roles/sources/templates/prometheus.yml.j24
-rw-r--r--tools/grafana/dashboards/demo_dashboard.json9
3 files changed, 13 insertions, 3 deletions
diff --git a/tools/docker-compose/ansible/roles/sources/defaults/main.yml b/tools/docker-compose/ansible/roles/sources/defaults/main.yml
index e1a67437d9..2086ad6ece 100644
--- a/tools/docker-compose/ansible/roles/sources/defaults/main.yml
+++ b/tools/docker-compose/ansible/roles/sources/defaults/main.yml
@@ -17,6 +17,7 @@ work_sign_key_dir: '../_sources/receptor'
work_sign_private_keyfile: "{{ work_sign_key_dir }}/work_private_key.pem"
work_sign_public_keyfile: "{{ work_sign_key_dir }}/work_public_key.pem"
+# SSO variables
enable_keycloak: false
enable_ldap: false
@@ -28,6 +29,8 @@ ldap_public_key_file: '{{ ldap_cert_dir }}/{{ ldap_public_key_file_name }}'
ldap_private_key_file: '{{ ldap_cert_dir }}/{{ ldap_private_key_file_name }}'
ldap_cert_subject: "/C=US/ST=NC/L=Durham/O=awx/CN="
+# Metrics
enable_splunk: false
enable_grafana: false
enable_prometheus: false
+scrape_interval: '5s'
diff --git a/tools/docker-compose/ansible/roles/sources/templates/prometheus.yml.j2 b/tools/docker-compose/ansible/roles/sources/templates/prometheus.yml.j2
index 7e1f5e4b02..22953c8627 100644
--- a/tools/docker-compose/ansible/roles/sources/templates/prometheus.yml.j2
+++ b/tools/docker-compose/ansible/roles/sources/templates/prometheus.yml.j2
@@ -1,7 +1,7 @@
#jinja2: lstrip_blocks: True
---
global:
- scrape_interval: 15s # Set the scrape interval to every 15 seconds. Default is every 1 minute.
+ scrape_interval: {{ scrape_interval }} # Set the scrape interval to something faster. Default is every 1 minute.
scrape_configs:
- job_name: 'awx'
@@ -11,7 +11,7 @@ scrape_configs:
# so no need to track nodes individually.
- awx1:8013
metrics_path: /api/v2/metrics
- scrape_interval: 5s
+ scrape_interval: {{ scrape_interval }}
scheme: http
params:
format: ['txt']
diff --git a/tools/grafana/dashboards/demo_dashboard.json b/tools/grafana/dashboards/demo_dashboard.json
index b909fdd541..23fc18e8b6 100644
--- a/tools/grafana/dashboards/demo_dashboard.json
+++ b/tools/grafana/dashboards/demo_dashboard.json
@@ -90,6 +90,7 @@
"y": 0
},
"id": 8,
+ "interval": "5",
"options": {
"legend": {
"calcs": [],
@@ -176,6 +177,7 @@
"y": 8
},
"id": 12,
+ "interval": "5",
"options": {
"legend": {
"calcs": [],
@@ -289,6 +291,7 @@
"y": 8
},
"id": 10,
+ "interval": "5",
"options": {
"legend": {
"calcs": [],
@@ -427,6 +430,7 @@
"y": 16
},
"id": 16,
+ "interval": "5",
"options": {
"legend": {
"calcs": [],
@@ -548,6 +552,7 @@
"y": 16
},
"id": 18,
+ "interval": "5",
"options": {
"legend": {
"calcs": [],
@@ -645,6 +650,7 @@
"y": 24
},
"id": 14,
+ "interval": "5",
"options": {
"legend": {
"calcs": [],
@@ -734,6 +740,7 @@
"y": 24
},
"id": 20,
+ "interval": "5",
"options": {
"legend": {
"calcs": [],
@@ -777,6 +784,6 @@
"timezone": "",
"title": "awx-demo",
"uid": "GISWZOXnk",
- "version": 4,
+ "version": 3,
"weekStart": ""
}