Merge pull request #179 from PureStorage-OpenConnect/native_prom_update

Update prom YAML for native exporter

Author: chrroberts-pure

extra/prometheus/prometheus.yml

@@ -23,24 +23,28 @@ scrape_configs:
     static_configs:
     - targets: ["prometheus-server.fqdn.com:9090"]
 
-# ################################ #
-# Pure Storage FlashArray Number 1 #
-# ################################ #
+# ################################## #
+# Pure Storage FlashArray Number 1   #
+# Running Purity//FA 6.7.0 or higher #
+# ################################## #
 # Create a single scrape job for each selected metric endpoint per FlashArray.
 # It is NOT recommended to scrape the root /metrics endpoint as it can be an expensive query.
 # Scrape job for Pure Storage FlashArray 1 scraping /metrics/array
   - job_name: 'purefa_array_arrayname01'
     metrics_path: /metrics/array
+    scheme: https
+    tls_config:
+      insecure_skip_verify: true
     # Bearer authorization token
     authorization:
       credentials: 11111111-1111-1111-1111-111111111111
     params:
-      endpoint: ['arrayname01.fqdn.com']
+      namespace: purefa
 
     static_configs:
     # purefa openmetrics exporter
     - targets:
-      - purefa-openmetrics-exporter.fqdn.com:9490
+      - arrayname01.fqdn.com
       labels:
         location: uk
         site: London
@@ -50,16 +54,19 @@ scrape_configs:
 # Scrape job for Pure Storage FlashArray 1 scraping /metrics/volumes
   - job_name: 'purefa_volumes_arrayname01'
     metrics_path: /metrics/volumes
+    scheme: https
+    tls_config:
+      insecure_skip_verify: true
     # Bearer authorization token
     authorization:
       credentials: 11111111-1111-1111-1111-111111111111
     params:
-      endpoint: ['arrayname01.fqdn.com']
+      namespace: purefa
 
     static_configs:
     # purefa openmetrics exporter
     - targets:
-      - purefa-openmetrics-exporter.fqdn.com:9490
+      - arrayname01.fqdn.com
       labels:
         location: uk
         site: London
@@ -69,16 +76,19 @@ scrape_configs:
 # Scrape job for Pure Storage FlashArray 1 scraping /metrics/hosts
   - job_name: 'purefa_hosts_arrayname01'
     metrics_path: /metrics/hosts
+    scheme: https
+    tls_config:
+      insecure_skip_verify: true
     # Bearer authorization token
     authorization:
       credentials: 11111111-1111-1111-1111-111111111111
     params:
-      endpoint: ['arrayname01.fqdn.com']
+      namespace: purefa
 
     static_configs:
     # purefa openmetrics exporter
     - targets:
-      - purefa-openmetrics-exporter.fqdn.com:9490
+      - arrayname01.fqdn.com
       labels:
         instance: arrayname01
         location: uk
@@ -88,16 +98,19 @@ scrape_configs:
 # Scrape job for Pure Storage FlashArray 1 scraping /metrics/pods
   - job_name: 'purefa_pods_arrayname01'
     metrics_path: /metrics/pods
+    scheme: https
+    tls_config:
+      insecure_skip_verify: true
     # Bearer authorization token
     authorization:
       credentials: 11111111-1111-1111-1111-111111111111
     params:
-      endpoint: ['arrayname01.fqdn.com']
+      namespace: purefa
 
     static_configs:
     # purefa openmetrics exporter
     - targets:
-      - purefa-openmetrics-exporter.fqdn.com:9490
+      - arrayname01.fqdn.com
       labels:
         instance: arrayname01
         location: uk
@@ -107,19 +120,22 @@ scrape_configs:
 # Scrape job for Pure Storage FlashArray 1 scraping /metrics/directories
   - job_name: 'purefa_directories_arrayname01'
     metrics_path: /metrics/directories
+    scheme: https
+    tls_config:
+      insecure_skip_verify: true
     # It is recommended to collect expensive queries less frequently such as /metrics/directories.
     scrape_interval:     15m # Set the scrape interval to every 15min. Default is every 1 minute. This overrides the global setting.
     scrape_timeout:      15m # Set the scrape timeout to shorter than or equal to scrape_interval. Default is every 1 minute.
     # Bearer authorization token
     authorization:
       credentials: 11111111-1111-1111-1111-111111111111
     params:
-      endpoint: ['arrayname01.fqdn.com']
+      namespace: purefa
 
     static_configs:
     # purefa openmetrics exporter
     - targets:
-      - purefa-openmetrics-exporter.fqdn.com:9490
+      - arrayname01.fqdn.com
       labels:
         instance: arrayname01
         location: uk
@@ -128,6 +144,7 @@ scrape_configs:
 
 # ################################ #
 # Pure Storage FlashArray Number 2 #
+# Running Purity//FA 6.6.x or less #
 # ################################ #
 # Scrape job for Pure Storage FlashArray 2 scraping /metrics/array
   - job_name: 'purefa_array_arrayname02'
@@ -225,4 +242,4 @@ scrape_configs:
         instance: arrayname02
         location: fr
         site: Paris
-        env: test
+        env: test