diff --git a/ansible/roles/grafana/templates/prometheus.yaml.j2 b/ansible/roles/grafana/templates/prometheus.yaml.j2 index 3021a791be..a0b1a4ae19 100644 --- a/ansible/roles/grafana/templates/prometheus.yaml.j2 +++ b/ansible/roles/grafana/templates/prometheus.yaml.j2 @@ -9,4 +9,3 @@ datasources: version: 1 jsonData: timeInterval: {{ prometheus_scrape_interval }} - diff --git a/doc/source/reference/logging-and-monitoring/prometheus-guide.rst b/doc/source/reference/logging-and-monitoring/prometheus-guide.rst index 000cd39f36..bf9103ca76 100644 --- a/doc/source/reference/logging-and-monitoring/prometheus-guide.rst +++ b/doc/source/reference/logging-and-monitoring/prometheus-guide.rst @@ -57,7 +57,7 @@ Configuration options - Description * - prometheus_scrape_interval - 60s - - Default scape interval for all jobs + - Default scrape interval for all jobs Extending prometheus.cfg ~~~~~~~~~~~~~~~~~~~~~~~~ @@ -67,7 +67,7 @@ If you want to add extra targets to scrape, you can extend the default ``{{ node_custom_config }}/prometheus/prometheus.yml.d``. These should have the same format as ``prometheus.yml``. These additional configs are merged so that any list items are extended. For example, if using the default value for -``node_custom_config``, you could add additional targets to scape by defining +``node_custom_config``, you could add additional targets to scrape by defining ``/etc/kolla/config/prometheus/prometheus.yml.d/10-custom.yml`` containing the following: