diff --git a/site/content/v2/metrics.md b/site/content/v2/metrics.md
index 934fd8af79..e90e55c931 100644
--- a/site/content/v2/metrics.md
+++ b/site/content/v2/metrics.md
@@ -1,5 +1,10 @@
 ---
-title: NGINX Agent v2 Metrics
-docs: DOCS-000
+title: Metrics
+catalog: true
+catalogType: v2metrics
+toc: true
 weight: 200
----
\ No newline at end of file
+docs: DOCS-000
+---
+
+{{< v2-metrics >}}
\ No newline at end of file
diff --git a/site/data/.gitkeep b/site/data/.gitkeep
deleted file mode 100644
index c3bb2f98bf..0000000000
--- a/site/data/.gitkeep
+++ /dev/null
@@ -1 +0,0 @@
-Add or mount data sources here
\ No newline at end of file
diff --git a/site/data/layouts/.gitkeep b/site/data/layouts/.gitkeep
deleted file mode 100644
index 02dbb3db14..0000000000
--- a/site/data/layouts/.gitkeep
+++ /dev/null
@@ -1 +0,0 @@
-Add or mount custom layouts here
\ No newline at end of file
diff --git a/site/data/v2metrics/client.network.latency.max.yml b/site/data/v2metrics/client.network.latency.max.yml
new file mode 100644
index 0000000000..c0b9bc5bb5
--- /dev/null
+++ b/site/data/v2metrics/client.network.latency.max.yml
@@ -0,0 +1,57 @@
+
+---
+name: client.network.latency.max
+categories:
+  - advanced-metrics
+description:
+  Maximal network latency on the client-side derived from TCP connection handshake.
+  If `family` dimension is set to `web`, the request was `http` type
+  and if the `family` is set to `tcp-udp`, the request was `stream` type.
+type: gauge
+source: advanced-metrics-module
+unit: milliseconds
+rate: ""
+visible: true
+compound_payload: "false"
+modules:
+  - adm
+  - acm
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - app
+  - environment
+  - component
+  - gateway
+  - http.hostname
+  - http.request_method
+  - http.response_code
+  - http.upstream_addr
+  - http.uri
+  - http.version_schema
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - instance_group
+  - system.tags
+  - acm_api_proxy_hostname
+  - acm_api_proxy_name
+  - acm_api_proxy_version
+  - acm_environments_name
+  - acm_environments_type
+  - acm_infra_workspaces_name
+  - acm_service_workspaces_name
+  - family
+  - proxied_protocol
+  - site
+  - environment_name
+  - gateway_name
+  - component_name
+  - app_name
+  - site_name
diff --git a/site/data/v2metrics/client.request.latency.max.yml b/site/data/v2metrics/client.request.latency.max.yml
new file mode 100644
index 0000000000..3cf023f734
--- /dev/null
+++ b/site/data/v2metrics/client.request.latency.max.yml
@@ -0,0 +1,57 @@
+
+---
+name: client.request.latency.max
+categories:
+  - advanced-metrics
+description: 
+  Maximal request latency on the client-side derived from HTTP(S) requests.
+  If `family` dimension is set to `web`, the request was `http` type
+  and if the `family` is set to `tcp-udp`, the request was `stream` type.
+type: gauge
+source: advanced-metrics-module
+unit: milliseconds
+rate: ""
+visible: true
+compound_payload: "false"
+modules:
+  - adm
+  - acm
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - app
+  - environment
+  - component
+  - gateway
+  - http.hostname
+  - http.request_method
+  - http.response_code
+  - http.upstream_addr
+  - http.uri
+  - http.version_schema
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - instance_group
+  - system.tags
+  - acm_api_proxy_hostname
+  - acm_api_proxy_name
+  - acm_api_proxy_version
+  - acm_environments_name
+  - acm_environments_type
+  - acm_infra_workspaces_name
+  - acm_service_workspaces_name
+  - family
+  - proxied_protocol
+  - site
+  - environment_name
+  - gateway_name
+  - component_name
+  - app_name
+  - site_name
diff --git a/site/data/v2metrics/client.response.latency.max.yml b/site/data/v2metrics/client.response.latency.max.yml
new file mode 100644
index 0000000000..a38e1e5226
--- /dev/null
+++ b/site/data/v2metrics/client.response.latency.max.yml
@@ -0,0 +1,57 @@
+
+---
+name: client.response.latency.max
+categories:
+  - advanced-metrics
+description: 
+  Maximal response latency on the client-side derived from HTTP(S) requests.
+  If `family` dimension is set to `web`, the request was `http` type
+  and if the `family` is set to `tcp-udp`, the request was `stream` type.
+type: gauge
+source: advanced-metrics-module
+unit: milliseconds
+rate: ""
+visible: true
+compound_payload: "false"
+modules:
+  - adm
+  - acm
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - app
+  - environment
+  - component
+  - gateway
+  - http.hostname
+  - http.request_method
+  - http.response_code
+  - http.upstream_addr
+  - http.uri
+  - http.version_schema
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - instance_group
+  - system.tags
+  - acm_api_proxy_hostname
+  - acm_api_proxy_name
+  - acm_api_proxy_version
+  - acm_environments_name
+  - acm_environments_type
+  - acm_infra_workspaces_name
+  - acm_service_workspaces_name
+  - family
+  - proxied_protocol
+  - site
+  - environment_name
+  - gateway_name
+  - component_name
+  - app_name
+  - site_name
diff --git a/site/data/v2metrics/client.ttfb.latency.max.yml b/site/data/v2metrics/client.ttfb.latency.max.yml
new file mode 100644
index 0000000000..eb2c496b44
--- /dev/null
+++ b/site/data/v2metrics/client.ttfb.latency.max.yml
@@ -0,0 +1,58 @@
+
+---
+name: client.ttfb.latency.max
+categories:
+  - advanced-metrics
+description:
+  Maximal time measured on the client-side from sending the first byte
+  of the request until receiving the first byte of the response. 
+  If `family` dimension is set to `web`, the request was `http` type
+  and if the `family` is set to `tcp-udp`, the request was `stream` type.
+type: gauge
+source: advanced-metrics-module
+unit: milliseconds
+rate: ""
+visible: true
+compound_payload: "false"
+modules:
+  - adm
+  - acm
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - app
+  - environment
+  - component
+  - gateway
+  - http.hostname
+  - http.request_method
+  - http.response_code
+  - http.upstream_addr
+  - http.uri
+  - http.version_schema
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - instance_group
+  - system.tags
+  - acm_api_proxy_hostname
+  - acm_api_proxy_name
+  - acm_api_proxy_version
+  - acm_environments_name
+  - acm_environments_type
+  - acm_infra_workspaces_name
+  - acm_service_workspaces_name
+  - family
+  - proxied_protocol
+  - site
+  - environment_name
+  - gateway_name
+  - component_name
+  - app_name
+  - site_name
diff --git a/site/data/v2metrics/http.request.bytes_rcvd.yml b/site/data/v2metrics/http.request.bytes_rcvd.yml
new file mode 100644
index 0000000000..ff39cd2fd2
--- /dev/null
+++ b/site/data/v2metrics/http.request.bytes_rcvd.yml
@@ -0,0 +1,54 @@
+
+---
+name: http.request.bytes_rcvd
+categories:
+  - advanced-metrics
+description: The total number of bytes received from clients.
+type: counter
+source: advanced-metrics-module
+unit: bytes
+rate: net_io_rate
+visible: true
+compound_payload: "false"
+modules:
+  - adm
+  - acm
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - app
+  - environment
+  - component
+  - gateway
+  - http.hostname
+  - http.request_method
+  - http.response_code
+  - http.upstream_addr
+  - http.uri
+  - http.version_schema
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - instance_group
+  - system.tags
+  - acm_api_proxy_hostname
+  - acm_api_proxy_name
+  - acm_api_proxy_version
+  - acm_environments_name
+  - acm_environments_type
+  - acm_infra_workspaces_name
+  - acm_service_workspaces_name
+  - family
+  - proxied_protocol
+  - site
+  - environment_name
+  - gateway_name
+  - component_name
+  - app_name
+  - site_name
diff --git a/site/data/v2metrics/http.request.bytes_sent.yml b/site/data/v2metrics/http.request.bytes_sent.yml
new file mode 100644
index 0000000000..6729005fba
--- /dev/null
+++ b/site/data/v2metrics/http.request.bytes_sent.yml
@@ -0,0 +1,54 @@
+
+---
+name: http.request.bytes_sent
+categories:
+  - advanced-metrics
+description: The total number of bytes sent from clients.
+type: counter
+source: advanced-metrics-module
+unit: bytes
+rate: net_io_rate
+visible: true
+compound_payload: "false"
+modules:
+  - adm
+  - acm
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - app
+  - environment
+  - component
+  - gateway
+  - http.hostname
+  - http.request_method
+  - http.response_code
+  - http.upstream_addr
+  - http.uri
+  - http.version_schema
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - instance_group
+  - system.tags
+  - acm_api_proxy_hostname
+  - acm_api_proxy_name
+  - acm_api_proxy_version
+  - acm_environments_name
+  - acm_environments_type
+  - acm_infra_workspaces_name
+  - acm_service_workspaces_name
+  - family
+  - proxied_protocol
+  - site
+  - environment_name
+  - gateway_name
+  - component_name
+  - app_name
+  - site_name
diff --git a/site/data/v2metrics/http.request.count.yml b/site/data/v2metrics/http.request.count.yml
new file mode 100644
index 0000000000..614b349a1b
--- /dev/null
+++ b/site/data/v2metrics/http.request.count.yml
@@ -0,0 +1,54 @@
+
+---
+name: http.request.count
+categories:
+  - advanced-metrics
+description: The total number of client requests received from clients.
+type: counter
+source: advanced-metrics-module
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+  - adm
+  - acm
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - app
+  - environment
+  - component
+  - gateway
+  - http.hostname
+  - http.request_method
+  - http.response_code
+  - http.upstream_addr
+  - http.uri
+  - http.version_schema
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - instance_group
+  - system.tags
+  - acm_api_proxy_hostname
+  - acm_api_proxy_name
+  - acm_api_proxy_version
+  - acm_environments_name
+  - acm_environments_type
+  - acm_infra_workspaces_name
+  - acm_service_workspaces_name
+  - family
+  - proxied_protocol
+  - site
+  - environment_name
+  - gateway_name
+  - component_name
+  - app_name
+  - site_name
diff --git a/site/data/v2metrics/nginx.config.generation.yml b/site/data/v2metrics/nginx.config.generation.yml
new file mode 100644
index 0000000000..dc385eb7c9
--- /dev/null
+++ b/site/data/v2metrics/nginx.config.generation.yml
@@ -0,0 +1,28 @@
+
+---
+name: nginx.config.generation
+categories:
+- nginx
+description: The total number of configuration reloads.
+type: counter
+counted: true
+source: self
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/nginx.http.conn.accepted.yml b/site/data/v2metrics/nginx.http.conn.accepted.yml
new file mode 100644
index 0000000000..298ed57505
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.conn.accepted.yml
@@ -0,0 +1,28 @@
+
+---
+name: nginx.http.conn.accepted
+categories:
+- nginx
+description: NGINX-wide statistics describing HTTP connections.
+type: counter
+source: stub_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/nginx.http.conn.active.yml b/site/data/v2metrics/nginx.http.conn.active.yml
new file mode 100644
index 0000000000..2cbb83f4dd
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.conn.active.yml
@@ -0,0 +1,28 @@
+
+---
+name: nginx.http.conn.active
+categories:
+- nginx
+description: NGINX-wide statistics describing HTTP connections.
+type: gauge
+source: stub_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/nginx.http.conn.current.yml b/site/data/v2metrics/nginx.http.conn.current.yml
new file mode 100644
index 0000000000..90c1da97c1
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.conn.current.yml
@@ -0,0 +1,28 @@
+
+---
+name: nginx.http.conn.current
+categories:
+- nginx
+description: NGINX-wide statistics describing HTTP connections.
+type: gauge
+source: stub_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/nginx.http.conn.dropped.yml b/site/data/v2metrics/nginx.http.conn.dropped.yml
new file mode 100644
index 0000000000..26591f6f9c
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.conn.dropped.yml
@@ -0,0 +1,28 @@
+
+---
+name: nginx.http.conn.dropped
+categories:
+- nginx
+description: NGINX-wide statistics describing HTTP connections.
+type: counter
+source: stub_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/nginx.http.conn.handled.yml b/site/data/v2metrics/nginx.http.conn.handled.yml
new file mode 100644
index 0000000000..9560bde139
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.conn.handled.yml
@@ -0,0 +1,28 @@
+
+---
+name: nginx.http.conn.handled
+categories:
+- nginx
+description: NGINX-wide statistics describing HTTP connections.
+type: counter
+source: stub_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/nginx.http.conn.idle.yml b/site/data/v2metrics/nginx.http.conn.idle.yml
new file mode 100644
index 0000000000..f71f72f1f2
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.conn.idle.yml
@@ -0,0 +1,28 @@
+
+---
+name: nginx.http.conn.idle
+categories:
+- nginx
+description: NGINX-wide statistics describing HTTP connections.
+type: gauge
+source: stub_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/nginx.http.conn.reading.yml b/site/data/v2metrics/nginx.http.conn.reading.yml
new file mode 100644
index 0000000000..d71c25d78d
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.conn.reading.yml
@@ -0,0 +1,28 @@
+
+---
+name: nginx.http.conn.reading
+categories:
+- nginx
+description: NGINX-wide statistics describing HTTP connections.
+type: gauge
+source: stub_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/nginx.http.conn.writing.yml b/site/data/v2metrics/nginx.http.conn.writing.yml
new file mode 100644
index 0000000000..c6a66c8d22
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.conn.writing.yml
@@ -0,0 +1,28 @@
+
+---
+name: nginx.http.conn.writing
+categories:
+- nginx
+description: NGINX-wide statistics describing HTTP connections.
+type: gauge
+source: stub_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/nginx.http.gzip.ratio.yml b/site/data/v2metrics/nginx.http.gzip.ratio.yml
new file mode 100644
index 0000000000..5a2f0795fe
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.gzip.ratio.yml
@@ -0,0 +1,27 @@
+
+---
+name: nginx.http.gzip.ratio
+categories:
+  - nginx
+description: "The compression ratio achieved on responses using `gzip,` computed as the ratio between the original and compressed response sizes."
+type: gauge
+source: access_log
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - system.tags
+  - instance_group
diff --git a/site/data/v2metrics/nginx.http.method.delete.yml b/site/data/v2metrics/nginx.http.method.delete.yml
new file mode 100644
index 0000000000..9f0b78a188
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.method.delete.yml
@@ -0,0 +1,27 @@
+
+---
+name: nginx.http.method.delete
+categories:
+  - nginx
+description: "The total number of requests with the method - DELETE."
+type: counter
+source: access_log
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - system.tags
+  - instance_group
diff --git a/site/data/v2metrics/nginx.http.method.get.yml b/site/data/v2metrics/nginx.http.method.get.yml
new file mode 100644
index 0000000000..3bee08acd1
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.method.get.yml
@@ -0,0 +1,27 @@
+
+---
+name: nginx.http.method.get
+categories:
+  - nginx
+description: "The total number of requests with the method - GET."
+type: counter
+source: access_log
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - system.tags
+  - instance_group
diff --git a/site/data/v2metrics/nginx.http.method.head.yml b/site/data/v2metrics/nginx.http.method.head.yml
new file mode 100644
index 0000000000..c86e1f7f10
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.method.head.yml
@@ -0,0 +1,27 @@
+
+---
+name: nginx.http.method.head
+categories:
+  - nginx
+description: "The total number of requests with the method - HEAD."
+type: counter
+source: access_log
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - system.tags
+  - instance_group
diff --git a/site/data/v2metrics/nginx.http.method.options.yml b/site/data/v2metrics/nginx.http.method.options.yml
new file mode 100644
index 0000000000..4256edb8b3
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.method.options.yml
@@ -0,0 +1,27 @@
+
+---
+name: nginx.http.method.options
+categories:
+  - nginx
+description: "The total number of requests with the method - OPTIONS."
+type: counter
+source: access_log
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - system.tags
+  - instance_group
diff --git a/site/data/v2metrics/nginx.http.method.others.yml b/site/data/v2metrics/nginx.http.method.others.yml
new file mode 100644
index 0000000000..0b5c839c79
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.method.others.yml
@@ -0,0 +1,27 @@
+
+---
+name: nginx.http.method.others
+categories:
+  - nginx
+description: "The total number of requests with the method - OTHERS."
+type: counter
+source: access_log
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - system.tags
+  - instance_group
diff --git a/site/data/v2metrics/nginx.http.method.post.yml b/site/data/v2metrics/nginx.http.method.post.yml
new file mode 100644
index 0000000000..aa4758884e
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.method.post.yml
@@ -0,0 +1,27 @@
+
+---
+name: nginx.http.method.post
+categories:
+  - nginx
+description: "The total number of requests with the method - POST."
+type: counter
+source: access_log
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - system.tags
+  - instance_group
diff --git a/site/data/v2metrics/nginx.http.method.put.yml b/site/data/v2metrics/nginx.http.method.put.yml
new file mode 100644
index 0000000000..fe3207a76f
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.method.put.yml
@@ -0,0 +1,27 @@
+
+---
+name: nginx.http.method.put
+categories:
+  - nginx
+description: "The total number of requests with the method - PUT."
+type: counter
+source: access_log
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - system.tags
+  - instance_group
diff --git a/site/data/v2metrics/nginx.http.request.body_bytes_sent.yml b/site/data/v2metrics/nginx.http.request.body_bytes_sent.yml
new file mode 100644
index 0000000000..26aab35981
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.request.body_bytes_sent.yml
@@ -0,0 +1,29 @@
+
+---
+name: nginx.http.request.body_bytes_sent
+categories:
+- nginx
+description: Number of bytes sent to clients, not counting response headers.
+type: counter
+counted: true
+source: access_combined
+unit: bytes
+rate: net_io_rate
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/nginx.http.request.buffered.yml b/site/data/v2metrics/nginx.http.request.buffered.yml
new file mode 100644
index 0000000000..b3a4b678d9
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.request.buffered.yml
@@ -0,0 +1,27 @@
+
+---
+name: nginx.http.request.buffered
+categories:
+  - nginx
+description: "The total number of HTTP requests with request body buffered."
+type: counter
+source: error_log
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - system.tags
+  - instance_group
diff --git a/site/data/v2metrics/nginx.http.request.bytes_sent.yml b/site/data/v2metrics/nginx.http.request.bytes_sent.yml
new file mode 100644
index 0000000000..b5c327f6aa
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.request.bytes_sent.yml
@@ -0,0 +1,27 @@
+
+---
+name: nginx.http.request.bytes_sent
+categories:
+  - nginx
+description: "The number of bytes sent to a client."
+type: gauge
+source: access_log
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - system.tags
+  - instance_group
diff --git a/site/data/v2metrics/nginx.http.request.count.yml b/site/data/v2metrics/nginx.http.request.count.yml
new file mode 100644
index 0000000000..b2a32fb48a
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.request.count.yml
@@ -0,0 +1,28 @@
+
+---
+name: nginx.http.request.count
+categories:
+- nginx
+description: Total number of client requests.
+type: counter
+source: stub_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/nginx.http.request.current.yml b/site/data/v2metrics/nginx.http.request.current.yml
new file mode 100644
index 0000000000..0f4954a83b
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.request.current.yml
@@ -0,0 +1,28 @@
+
+---
+name: nginx.http.request.current
+categories:
+- nginx
+description: Number of currently active requests (reading and writing).
+type: counter
+source: stub_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/nginx.http.request.length.yml b/site/data/v2metrics/nginx.http.request.length.yml
new file mode 100644
index 0000000000..5e7e453e8c
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.request.length.yml
@@ -0,0 +1,27 @@
+
+---
+name: nginx.http.request.length
+categories:
+  - nginx
+description: "The request length (including request line, header, and request body)."
+type: gauge
+source: access_log
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - system.tags
+  - instance_group
diff --git a/site/data/v2metrics/nginx.http.request.malformed.yml b/site/data/v2metrics/nginx.http.request.malformed.yml
new file mode 100644
index 0000000000..246d0a66de
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.request.malformed.yml
@@ -0,0 +1,27 @@
+
+---
+name: nginx.http.request.malformed
+categories:
+  - nginx
+description: "The total number of malformed requests (i.e., HTTP Status 400)."
+type: counter
+source: access_log
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - system.tags
+  - instance_group
diff --git a/site/data/v2metrics/nginx.http.request.time.max.yml b/site/data/v2metrics/nginx.http.request.time.max.yml
new file mode 100644
index 0000000000..cd6ef09689
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.request.time.max.yml
@@ -0,0 +1,27 @@
+
+---
+name: nginx.http.request.time.max
+categories:
+  - nginx
+description: "The maximum request time, a request time is the full request processing time by NGINX."
+type: gauge
+source: access_log
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - system.tags
+  - instance_group
diff --git a/site/data/v2metrics/nginx.http.request.time.median.yml b/site/data/v2metrics/nginx.http.request.time.median.yml
new file mode 100644
index 0000000000..90bb7876f8
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.request.time.median.yml
@@ -0,0 +1,27 @@
+
+---
+name: nginx.http.request.time.median
+categories:
+  - nginx
+description: "The median request time, a request time is the full request processing time by NGINX."
+type: gauge
+source: access_log
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - system.tags
+  - instance_group
diff --git a/site/data/v2metrics/nginx.http.request.time.pctl95.yml b/site/data/v2metrics/nginx.http.request.time.pctl95.yml
new file mode 100644
index 0000000000..1bca844eb8
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.request.time.pctl95.yml
@@ -0,0 +1,27 @@
+
+---
+name: nginx.http.request.time.pctl95
+categories:
+  - nginx
+description: "The 95th percentile of request times, a request time is the full request processing time by NGINX."
+type: gauge
+source: access_log
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - system.tags
+  - instance_group
diff --git a/site/data/v2metrics/nginx.http.request.time.yml b/site/data/v2metrics/nginx.http.request.time.yml
new file mode 100644
index 0000000000..84132ede76
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.request.time.yml
@@ -0,0 +1,27 @@
+
+---
+name: nginx.http.request.time
+categories:
+  - nginx
+description: "The full request processing time by NGINX, starting when NGINX reads the first byte from the client and ending when NGINX sends the last byte of the response body."
+type: gauge
+source: access_log
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - system.tags
+  - instance_group
diff --git a/site/data/v2metrics/nginx.http.status.1xx.yml b/site/data/v2metrics/nginx.http.status.1xx.yml
new file mode 100644
index 0000000000..7d412b85aa
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.status.1xx.yml
@@ -0,0 +1,29 @@
+
+---
+name: nginx.http.status.1xx
+categories:
+- nginx
+description: Number of requests with HTTP status codes 1xx.
+type: counter
+counted: true
+source: access_combined
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- instance_group
+- system.tags
+- nginx_id
diff --git a/site/data/v2metrics/nginx.http.status.2xx.yml b/site/data/v2metrics/nginx.http.status.2xx.yml
new file mode 100644
index 0000000000..f76fa49e78
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.status.2xx.yml
@@ -0,0 +1,29 @@
+
+---
+name: nginx.http.status.2xx
+categories:
+- nginx
+description: Number of requests with HTTP status codes 2xx.
+type: counter
+counted: true
+source: access_combined
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/nginx.http.status.3xx.yml b/site/data/v2metrics/nginx.http.status.3xx.yml
new file mode 100644
index 0000000000..d81d1fea28
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.status.3xx.yml
@@ -0,0 +1,29 @@
+
+---
+name: nginx.http.status.3xx
+categories:
+- nginx
+description: Number of requests with HTTP status codes 3xx.
+type: counter
+counted: true
+source: access_combined
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/nginx.http.status.403.yml b/site/data/v2metrics/nginx.http.status.403.yml
new file mode 100644
index 0000000000..df378c0007
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.status.403.yml
@@ -0,0 +1,27 @@
+
+---
+name: nginx.http.status.403
+categories:
+  - nginx
+description: "The total number of HTTP requests with a status code 403."
+type: counter
+source: access_log
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - system.tags
+  - instance_group
diff --git a/site/data/v2metrics/nginx.http.status.404.yml b/site/data/v2metrics/nginx.http.status.404.yml
new file mode 100644
index 0000000000..3a88bff6d4
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.status.404.yml
@@ -0,0 +1,27 @@
+
+---
+name: nginx.http.status.404
+categories:
+  - nginx
+description: "The total number of HTTP requests with a status code 404."
+type: counter
+source: access_log
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - system.tags
+  - instance_group
diff --git a/site/data/v2metrics/nginx.http.status.4xx.yml b/site/data/v2metrics/nginx.http.status.4xx.yml
new file mode 100644
index 0000000000..a8ce485e94
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.status.4xx.yml
@@ -0,0 +1,29 @@
+
+---
+name: nginx.http.status.4xx
+categories:
+- nginx
+description: Number of requests with HTTP status codes 4xx.
+type: counter
+counted: true
+source: access_combined
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- instance_group
+- system.tags
+- nginx_id
diff --git a/site/data/v2metrics/nginx.http.status.500.yml b/site/data/v2metrics/nginx.http.status.500.yml
new file mode 100644
index 0000000000..7cd70bac22
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.status.500.yml
@@ -0,0 +1,27 @@
+
+---
+name: nginx.http.status.500
+categories:
+  - nginx
+description: "The total number of HTTP requests with a status code 500."
+type: counter
+source: access_log
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - system.tags
+  - instance_group
diff --git a/site/data/v2metrics/nginx.http.status.502.yml b/site/data/v2metrics/nginx.http.status.502.yml
new file mode 100644
index 0000000000..1d25fb99ed
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.status.502.yml
@@ -0,0 +1,27 @@
+
+---
+name: nginx.http.status.502
+categories:
+  - nginx
+description: "The total number of HTTP requests with a status code 502."
+type: counter
+source: access_log
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - system.tags
+  - instance_group
diff --git a/site/data/v2metrics/nginx.http.status.503.yml b/site/data/v2metrics/nginx.http.status.503.yml
new file mode 100644
index 0000000000..d600e46355
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.status.503.yml
@@ -0,0 +1,27 @@
+
+---
+name: nginx.http.status.503
+categories:
+  - nginx
+description: "The total number of HTTP requests with a status code 503."
+type: counter
+source: access_log
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - system.tags
+  - instance_group
diff --git a/site/data/v2metrics/nginx.http.status.504.yml b/site/data/v2metrics/nginx.http.status.504.yml
new file mode 100644
index 0000000000..d5d1b55f41
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.status.504.yml
@@ -0,0 +1,27 @@
+
+---
+name: nginx.http.status.504
+categories:
+  - nginx
+description: "The total number of HTTP requests with a status code 504."
+type: counter
+source: access_log
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - system.tags
+  - instance_group
diff --git a/site/data/v2metrics/nginx.http.status.5xx.yml b/site/data/v2metrics/nginx.http.status.5xx.yml
new file mode 100644
index 0000000000..e95bd2d77b
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.status.5xx.yml
@@ -0,0 +1,29 @@
+
+---
+name: nginx.http.status.5xx
+categories:
+- nginx
+description: Number of requests with HTTP status codes 5xx.
+type: counter
+counted: true
+source: access_combined
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/nginx.http.status.discarded.yml b/site/data/v2metrics/nginx.http.status.discarded.yml
new file mode 100644
index 0000000000..ddb1fc438d
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.status.discarded.yml
@@ -0,0 +1,27 @@
+
+---
+name: nginx.http.status.discarded
+categories:
+  - nginx
+description: "The total number of discarded requests (i.e., HTTP Status 499)."
+type: counter
+source: access_log
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - system.tags
+  - instance_group
diff --git a/site/data/v2metrics/nginx.http.v0_9.yml b/site/data/v2metrics/nginx.http.v0_9.yml
new file mode 100644
index 0000000000..7e6651b6b4
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.v0_9.yml
@@ -0,0 +1,27 @@
+
+---
+name: nginx.http.v0_9
+categories:
+  - nginx
+description: "The total number of HTTP Requests using HTTP/0.9."
+type: counter
+source: access_log
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - system.tags
+  - instance_group
diff --git a/site/data/v2metrics/nginx.http.v1_0.yml b/site/data/v2metrics/nginx.http.v1_0.yml
new file mode 100644
index 0000000000..1fbdf53936
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.v1_0.yml
@@ -0,0 +1,27 @@
+
+---
+name: nginx.http.v1_0
+categories:
+  - nginx
+description: "The total number of HTTP Requests using HTTP/1.0."
+type: counter
+source: access_log
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - system.tags
+  - instance_group
diff --git a/site/data/v2metrics/nginx.http.v1_1.yml b/site/data/v2metrics/nginx.http.v1_1.yml
new file mode 100644
index 0000000000..92b7663699
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.v1_1.yml
@@ -0,0 +1,27 @@
+
+---
+name: nginx.http.v1_1
+categories:
+  - nginx
+description: "The total number of HTTP Requests using HTTP/1.1."
+type: counter
+source: access_log
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - system.tags
+  - instance_group
diff --git a/site/data/v2metrics/nginx.http.v2.yml b/site/data/v2metrics/nginx.http.v2.yml
new file mode 100644
index 0000000000..4342ef878d
--- /dev/null
+++ b/site/data/v2metrics/nginx.http.v2.yml
@@ -0,0 +1,27 @@
+
+---
+name: nginx.http.v2
+categories:
+  - nginx
+description: "The total number of HTTP Requests using HTTP/2."
+type: counter
+source: access_log
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - system.tags
+  - instance_group
diff --git a/site/data/v2metrics/nginx.status.yml b/site/data/v2metrics/nginx.status.yml
new file mode 100644
index 0000000000..8308580e39
--- /dev/null
+++ b/site/data/v2metrics/nginx.status.yml
@@ -0,0 +1,28 @@
+
+---
+name: nginx.status
+categories:
+- nginx
+description: 'Status of nginx: 1 - nginx is up, 0 - nginx is down.'
+type: gauge
+counted: true
+source: self
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/nginx.upstream.request.failed.yml b/site/data/v2metrics/nginx.upstream.request.failed.yml
new file mode 100644
index 0000000000..33b24ed294
--- /dev/null
+++ b/site/data/v2metrics/nginx.upstream.request.failed.yml
@@ -0,0 +1,27 @@
+
+---
+name: nginx.upstream.request.failed
+categories:
+  - nginx
+description: "The total number of HTTP requests where upstream requests failed."
+type: counter
+source: error_log
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - system.tags
+  - instance_group
\ No newline at end of file
diff --git a/site/data/v2metrics/nginx.upstream.response.buffered.yml b/site/data/v2metrics/nginx.upstream.response.buffered.yml
new file mode 100644
index 0000000000..950c821514
--- /dev/null
+++ b/site/data/v2metrics/nginx.upstream.response.buffered.yml
@@ -0,0 +1,27 @@
+
+---
+name: nginx.upstream.response.buffered
+categories:
+  - nginx
+description: "The total number of HTTP requests with responses buffered."
+type: counter
+source: error_log
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - system.tags
+  - instance_group
\ No newline at end of file
diff --git a/site/data/v2metrics/nginx.upstream.response.failed.yml b/site/data/v2metrics/nginx.upstream.response.failed.yml
new file mode 100644
index 0000000000..9af5bb87d1
--- /dev/null
+++ b/site/data/v2metrics/nginx.upstream.response.failed.yml
@@ -0,0 +1,27 @@
+
+---
+name: nginx.upstream.response.failed
+categories:
+  - nginx
+description: "The total number of HTTP requests where upstream responses failed."
+type: counter
+source: error_log
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - system.tags
+  - instance_group
\ No newline at end of file
diff --git a/site/data/v2metrics/nginx.workers.count.yml b/site/data/v2metrics/nginx.workers.count.yml
new file mode 100644
index 0000000000..2b6a38f093
--- /dev/null
+++ b/site/data/v2metrics/nginx.workers.count.yml
@@ -0,0 +1,29 @@
+
+---
+name: nginx.workers.count
+categories:
+- nginx
+description: Number of NGINX worker processes observed.
+type: gauge
+counted: true
+source: psutil
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/nginx.workers.cpu.system.yml b/site/data/v2metrics/nginx.workers.cpu.system.yml
new file mode 100644
index 0000000000..be1ba0c3dd
--- /dev/null
+++ b/site/data/v2metrics/nginx.workers.cpu.system.yml
@@ -0,0 +1,29 @@
+
+---
+name: nginx.workers.cpu.system
+categories:
+- nginx
+description: CPU utilization percentage observed for NGINX worker processes (system).
+type: counter
+counted: true
+source: psutil
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/nginx.workers.cpu.total.yml b/site/data/v2metrics/nginx.workers.cpu.total.yml
new file mode 100644
index 0000000000..ed19900c60
--- /dev/null
+++ b/site/data/v2metrics/nginx.workers.cpu.total.yml
@@ -0,0 +1,29 @@
+
+---
+name: nginx.workers.cpu.total
+categories:
+- nginx
+description: CPU utilization percentage observed for NGINX worker processes (total).
+type: counter
+counted: true
+source: psutil
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/nginx.workers.cpu.user.yml b/site/data/v2metrics/nginx.workers.cpu.user.yml
new file mode 100644
index 0000000000..5c9dabcd3f
--- /dev/null
+++ b/site/data/v2metrics/nginx.workers.cpu.user.yml
@@ -0,0 +1,29 @@
+
+---
+name: nginx.workers.cpu.user
+categories:
+- nginx
+description: CPU utilization percentage observed for NGINX worker processes (user).
+type: counter
+counted: true
+source: psutil
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/nginx.workers.fds_count.yml b/site/data/v2metrics/nginx.workers.fds_count.yml
new file mode 100644
index 0000000000..b1992f0282
--- /dev/null
+++ b/site/data/v2metrics/nginx.workers.fds_count.yml
@@ -0,0 +1,29 @@
+
+---
+name: nginx.workers.fds_count
+categories:
+- nginx
+description: Number of file descriptors utilized by NGINX worker processes.
+type: gauge
+counted: true
+source: psutil
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/nginx.workers.io.kbs_r.yml b/site/data/v2metrics/nginx.workers.io.kbs_r.yml
new file mode 100644
index 0000000000..1c0b6016c5
--- /dev/null
+++ b/site/data/v2metrics/nginx.workers.io.kbs_r.yml
@@ -0,0 +1,29 @@
+
+---
+name: nginx.workers.io.kbs_r
+categories:
+- nginx
+description: Number of kilobytes read from NGINX worker processes.
+type: counter
+counted: true
+source: psutil
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/nginx.workers.io.kbs_w.yml b/site/data/v2metrics/nginx.workers.io.kbs_w.yml
new file mode 100644
index 0000000000..06ec297dea
--- /dev/null
+++ b/site/data/v2metrics/nginx.workers.io.kbs_w.yml
@@ -0,0 +1,29 @@
+
+---
+name: nginx.workers.io.kbs_w
+categories:
+- nginx
+description: Number of kilobytes written to disk by NGINX worker processes.
+type: counter
+counted: true
+source: psutil
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/nginx.workers.mem.rss.yml b/site/data/v2metrics/nginx.workers.mem.rss.yml
new file mode 100644
index 0000000000..e1a0964861
--- /dev/null
+++ b/site/data/v2metrics/nginx.workers.mem.rss.yml
@@ -0,0 +1,29 @@
+
+---
+name: nginx.workers.mem.rss
+categories:
+- nginx
+description: Memory utilized by NGINX worker processes (Resident Set Size).
+type: counter
+counted: true
+source: psutil
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/nginx.workers.mem.rss_pct.yml b/site/data/v2metrics/nginx.workers.mem.rss_pct.yml
new file mode 100644
index 0000000000..a176f54a10
--- /dev/null
+++ b/site/data/v2metrics/nginx.workers.mem.rss_pct.yml
@@ -0,0 +1,30 @@
+
+---
+name: nginx.workers.mem.rss_pct
+categories:
+- nginx
+description: Memory utilized by NGINX worker processes in percentage (Resident Set
+  Size).
+type: gauge
+counted: true
+source: psutil
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/nginx.workers.mem.vms.yml b/site/data/v2metrics/nginx.workers.mem.vms.yml
new file mode 100644
index 0000000000..3a90a8bba2
--- /dev/null
+++ b/site/data/v2metrics/nginx.workers.mem.vms.yml
@@ -0,0 +1,29 @@
+
+---
+name: nginx.workers.mem.vms
+categories:
+- nginx
+description: Memory utilized by NGINX worker processes (Virtual Memory Size).
+type: counter
+counted: true
+source: psutil
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/nginx.workers.rlimit_nofile.yml b/site/data/v2metrics/nginx.workers.rlimit_nofile.yml
new file mode 100644
index 0000000000..6cf4466876
--- /dev/null
+++ b/site/data/v2metrics/nginx.workers.rlimit_nofile.yml
@@ -0,0 +1,30 @@
+
+---
+name: nginx.workers.rlimit_nofile
+categories:
+- nginx
+description: Hard limit on the number of file descriptors as seen by NGINX worker
+  processes.
+type: gauge
+counted: true
+source: psutil
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/plus.cache.bypass.bytes.yml b/site/data/v2metrics/plus.cache.bypass.bytes.yml
new file mode 100644
index 0000000000..3dc3b43606
--- /dev/null
+++ b/site/data/v2metrics/plus.cache.bypass.bytes.yml
@@ -0,0 +1,37 @@
+
+---
+name: plus.cache.bypass.bytes
+categories:
+- nginx
+description: The total number of bytes read from the proxied server.
+type: counter
+source: plus_status
+unit: bytes
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- cache_zone
+- app
+- environment
+- component
+- site
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.cache.bypass.responses.yml b/site/data/v2metrics/plus.cache.bypass.responses.yml
new file mode 100644
index 0000000000..b8d2af348a
--- /dev/null
+++ b/site/data/v2metrics/plus.cache.bypass.responses.yml
@@ -0,0 +1,39 @@
+
+---
+name: plus.cache.bypass.responses
+categories:
+- nginx
+description: The total number of responses not looked up in the cache due to the proxy_cache_bypass
+  and other “*_cache_bypass” directives.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- cache_zone
+- app
+- environment
+- component
+- site
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.cache.expired.bytes.yml b/site/data/v2metrics/plus.cache.expired.bytes.yml
new file mode 100644
index 0000000000..56bb7f81de
--- /dev/null
+++ b/site/data/v2metrics/plus.cache.expired.bytes.yml
@@ -0,0 +1,37 @@
+
+---
+name: plus.cache.expired.bytes
+categories:
+- nginx
+description: The total number of bytes read from the proxied server.
+type: counter
+source: plus_status
+unit: bytes
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- cache_zone
+- app
+- environment
+- component
+- site
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.cache.expired.responses.yml b/site/data/v2metrics/plus.cache.expired.responses.yml
new file mode 100644
index 0000000000..eef68bdbd4
--- /dev/null
+++ b/site/data/v2metrics/plus.cache.expired.responses.yml
@@ -0,0 +1,38 @@
+
+---
+name: plus.cache.expired.responses
+categories:
+- nginx
+description: The total number of expired responses not taken from the cache.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- cache_zone
+- app
+- environment
+- component
+- site
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.cache.hit.bytes.yml b/site/data/v2metrics/plus.cache.hit.bytes.yml
new file mode 100644
index 0000000000..dedd9fe3ab
--- /dev/null
+++ b/site/data/v2metrics/plus.cache.hit.bytes.yml
@@ -0,0 +1,37 @@
+
+---
+name: plus.cache.hit.bytes
+categories:
+- nginx
+description: The total number of bytes read from the cache.
+type: counter
+source: plus_status
+unit: bytes
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- cache_zone
+- app
+- environment
+- component
+- site
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.cache.hit.responses.yml b/site/data/v2metrics/plus.cache.hit.responses.yml
new file mode 100644
index 0000000000..4eed3fe4c3
--- /dev/null
+++ b/site/data/v2metrics/plus.cache.hit.responses.yml
@@ -0,0 +1,38 @@
+
+---
+name: plus.cache.hit.responses
+categories:
+- nginx
+description: The total number of valid responses read from the cache.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- cache_zone
+- app
+- environment
+- component
+- site
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.cache.max_size.yml b/site/data/v2metrics/plus.cache.max_size.yml
new file mode 100644
index 0000000000..efa74b4be2
--- /dev/null
+++ b/site/data/v2metrics/plus.cache.max_size.yml
@@ -0,0 +1,37 @@
+
+---
+name: plus.cache.max_size
+categories:
+- nginx
+description: The limit on the maximum size of the cache specified in the configuration.
+type: gauge
+source: plus_status
+unit: bytes
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- cache_zone
+- app
+- environment
+- component
+- site
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.cache.miss.bytes.yml b/site/data/v2metrics/plus.cache.miss.bytes.yml
new file mode 100644
index 0000000000..d8d78f84f4
--- /dev/null
+++ b/site/data/v2metrics/plus.cache.miss.bytes.yml
@@ -0,0 +1,37 @@
+
+---
+name: plus.cache.miss.bytes
+categories:
+- nginx
+description: The total number of bytes read from the proxied server.
+type: counter
+source: plus_status
+unit: bytes
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- cache_zone
+- app
+- environment
+- component
+- site
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.cache.miss.responses.yml b/site/data/v2metrics/plus.cache.miss.responses.yml
new file mode 100644
index 0000000000..841fc1c2fa
--- /dev/null
+++ b/site/data/v2metrics/plus.cache.miss.responses.yml
@@ -0,0 +1,38 @@
+
+---
+name: plus.cache.miss.responses
+categories:
+- nginx
+description: The total number of responses not found in the cache.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- cache_zone
+- app
+- environment
+- component
+- site
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.cache.revalidated.bytes.yml b/site/data/v2metrics/plus.cache.revalidated.bytes.yml
new file mode 100644
index 0000000000..75a3d67cb6
--- /dev/null
+++ b/site/data/v2metrics/plus.cache.revalidated.bytes.yml
@@ -0,0 +1,37 @@
+
+---
+name: plus.cache.revalidated.bytes
+categories:
+- nginx
+description: The total number of bytes read from the cache.
+type: counter
+source: plus_status
+unit: bytes
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- cache_zone
+- app
+- environment
+- component
+- site
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.cache.revalidated.responses.yml b/site/data/v2metrics/plus.cache.revalidated.responses.yml
new file mode 100644
index 0000000000..825de05ff4
--- /dev/null
+++ b/site/data/v2metrics/plus.cache.revalidated.responses.yml
@@ -0,0 +1,39 @@
+
+---
+name: plus.cache.revalidated.responses
+categories:
+- nginx
+description: The total number of expired and revalidated responses read from the cache
+  (see proxy_cache_revalidate and other “*_cache_revalidate” directives.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- cache_zone
+- app
+- environment
+- component
+- site
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.cache.size.yml b/site/data/v2metrics/plus.cache.size.yml
new file mode 100644
index 0000000000..3f0f3489e6
--- /dev/null
+++ b/site/data/v2metrics/plus.cache.size.yml
@@ -0,0 +1,37 @@
+
+---
+name: plus.cache.size
+categories:
+- nginx
+description: The current size of the cache.
+type: gauge
+source: plus_status
+unit: bytes
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- cache_zone
+- app
+- environment
+- component
+- site
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.cache.stale.bytes.yml b/site/data/v2metrics/plus.cache.stale.bytes.yml
new file mode 100644
index 0000000000..0fc24ba97e
--- /dev/null
+++ b/site/data/v2metrics/plus.cache.stale.bytes.yml
@@ -0,0 +1,37 @@
+
+---
+name: plus.cache.stale.bytes
+categories:
+- nginx
+description: The total number of bytes read from the cache.
+type: counter
+source: plus_status
+unit: bytes
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- cache_zone
+- app
+- environment
+- component
+- site
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.cache.stale.responses.yml b/site/data/v2metrics/plus.cache.stale.responses.yml
new file mode 100644
index 0000000000..9970d630cb
--- /dev/null
+++ b/site/data/v2metrics/plus.cache.stale.responses.yml
@@ -0,0 +1,39 @@
+
+---
+name: plus.cache.stale.responses
+categories:
+- nginx
+description: The total number of expired responses read from the cache (see proxy_cache_use_stale
+  and other “*_cache_use_stale” directives).
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- cache_zone
+- app
+- environment
+- component
+- site
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.cache.updating.bytes.yml b/site/data/v2metrics/plus.cache.updating.bytes.yml
new file mode 100644
index 0000000000..f627e43bcd
--- /dev/null
+++ b/site/data/v2metrics/plus.cache.updating.bytes.yml
@@ -0,0 +1,37 @@
+
+---
+name: plus.cache.updating.bytes
+categories:
+- nginx
+description: The total number of bytes read from the cache.
+type: counter
+source: plus_status
+unit: bytes
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- cache_zone
+- app
+- environment
+- component
+- site
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.cache.updating.responses.yml b/site/data/v2metrics/plus.cache.updating.responses.yml
new file mode 100644
index 0000000000..db5ff85eee
--- /dev/null
+++ b/site/data/v2metrics/plus.cache.updating.responses.yml
@@ -0,0 +1,39 @@
+
+---
+name: plus.cache.updating.responses
+categories:
+- nginx
+description: The total number of expired responses read from the cache while responses
+  were being updated (see proxy_cache_use_stale and other “*_cache_use_stale” directives).
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- cache_zone
+- app
+- environment
+- component
+- site
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.http.limit_conns.passed.yml b/site/data/v2metrics/plus.http.limit_conns.passed.yml
new file mode 100644
index 0000000000..7428738f53
--- /dev/null
+++ b/site/data/v2metrics/plus.http.limit_conns.passed.yml
@@ -0,0 +1,28 @@
+
+---
+name: plus.http.limit_conns.passed
+categories:
+  - nginx
+description: "The total number of connections that were neither limited nor accounted as limited."
+type: counter
+source: plus_status
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - system.tags
+  - instance_group
+  - limit_conn_zone
diff --git a/site/data/v2metrics/plus.http.limit_conns.rejected.yml b/site/data/v2metrics/plus.http.limit_conns.rejected.yml
new file mode 100644
index 0000000000..3b1fa3645e
--- /dev/null
+++ b/site/data/v2metrics/plus.http.limit_conns.rejected.yml
@@ -0,0 +1,28 @@
+
+---
+name: plus.http.limit_conns.rejected
+categories:
+  - nginx
+description: "The total number of connections that were rejected."
+type: counter
+source: plus_status
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - system.tags
+  - instance_group
+  - limit_conn_zone
\ No newline at end of file
diff --git a/site/data/v2metrics/plus.http.limit_conns.rejected_dry_run.yml b/site/data/v2metrics/plus.http.limit_conns.rejected_dry_run.yml
new file mode 100644
index 0000000000..3682253e7f
--- /dev/null
+++ b/site/data/v2metrics/plus.http.limit_conns.rejected_dry_run.yml
@@ -0,0 +1,28 @@
+
+---
+name: plus.http.limit_conns.rejected_dry_run
+categories:
+  - nginx
+description: "The total number of connections accounted as rejected in the dry run mode."
+type: counter
+source: plus_status
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - system.tags
+  - instance_group
+  - limit_conn_zone
\ No newline at end of file
diff --git a/site/data/v2metrics/plus.http.limit_reqs.delayed.yml b/site/data/v2metrics/plus.http.limit_reqs.delayed.yml
new file mode 100644
index 0000000000..f86dde184a
--- /dev/null
+++ b/site/data/v2metrics/plus.http.limit_reqs.delayed.yml
@@ -0,0 +1,28 @@
+
+---
+name: plus.http.limit_reqs.delayed
+categories:
+  - nginx
+description: "The total number of requests that were delayed."
+type: counter
+source: plus_status
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - system.tags
+  - instance_group
+  - limit_req_zone
\ No newline at end of file
diff --git a/site/data/v2metrics/plus.http.limit_reqs.delayed_dry_run.yml b/site/data/v2metrics/plus.http.limit_reqs.delayed_dry_run.yml
new file mode 100644
index 0000000000..102fe6abb2
--- /dev/null
+++ b/site/data/v2metrics/plus.http.limit_reqs.delayed_dry_run.yml
@@ -0,0 +1,28 @@
+
+---
+name: plus.http.limit_reqs.delayed_dry_run
+categories:
+  - nginx
+description: "The total number of requests accounted as delayed in the dry run mode."
+type: counter
+source: plus_status
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - system.tags
+  - instance_group
+  - limit_req_zone
\ No newline at end of file
diff --git a/site/data/v2metrics/plus.http.limit_reqs.passed.yml b/site/data/v2metrics/plus.http.limit_reqs.passed.yml
new file mode 100644
index 0000000000..7e4bec75e8
--- /dev/null
+++ b/site/data/v2metrics/plus.http.limit_reqs.passed.yml
@@ -0,0 +1,28 @@
+
+---
+name: plus.http.limit_reqs.passed
+categories:
+  - nginx
+description: "The total number of requests that were neither limited nor accounted as limited."
+type: counter
+source: plus_status
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - system.tags
+  - instance_group
+  - limit_req_zone
\ No newline at end of file
diff --git a/site/data/v2metrics/plus.http.limit_reqs.rejected.yml b/site/data/v2metrics/plus.http.limit_reqs.rejected.yml
new file mode 100644
index 0000000000..fd63ce12bd
--- /dev/null
+++ b/site/data/v2metrics/plus.http.limit_reqs.rejected.yml
@@ -0,0 +1,28 @@
+
+---
+name: plus.http.limit_reqs.rejected
+categories:
+  - nginx
+description: "The total number of requests that were rejected."
+type: counter
+source: plus_status
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - system.tags
+  - instance_group
+  - limit_req_zone
\ No newline at end of file
diff --git a/site/data/v2metrics/plus.http.limit_reqs.rejected_dry_run.yml b/site/data/v2metrics/plus.http.limit_reqs.rejected_dry_run.yml
new file mode 100644
index 0000000000..6cd6257161
--- /dev/null
+++ b/site/data/v2metrics/plus.http.limit_reqs.rejected_dry_run.yml
@@ -0,0 +1,28 @@
+
+---
+name: plus.http.limit_reqs.rejected_dry_run
+categories:
+  - nginx
+description: "The total number of requests accounted as rejected in the dry run mode."
+type: counter
+source: plus_status
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - system.tags
+  - instance_group
+  - limit_req_zone
\ No newline at end of file
diff --git a/site/data/v2metrics/plus.http.request.bytes_rcvd.yml b/site/data/v2metrics/plus.http.request.bytes_rcvd.yml
new file mode 100644
index 0000000000..e56d39ee10
--- /dev/null
+++ b/site/data/v2metrics/plus.http.request.bytes_rcvd.yml
@@ -0,0 +1,30 @@
+
+---
+name: plus.http.request.bytes_rcvd
+categories:
+- nginx
+description: The total number of bytes received from clients.
+type: counter
+source: plus_status
+unit: bytes
+rate: net_io_rate
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- server_zone
+- location_zone
diff --git a/site/data/v2metrics/plus.http.request.bytes_sent.yml b/site/data/v2metrics/plus.http.request.bytes_sent.yml
new file mode 100644
index 0000000000..49cb8b7eb8
--- /dev/null
+++ b/site/data/v2metrics/plus.http.request.bytes_sent.yml
@@ -0,0 +1,30 @@
+
+---
+name: plus.http.request.bytes_sent
+categories:
+- nginx
+description: The total number of bytes sent to clients.
+type: counter
+source: plus_status
+unit: bytes
+rate: net_io_rate
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- server_zone
+- location_zone
diff --git a/site/data/v2metrics/plus.http.request.count.yml b/site/data/v2metrics/plus.http.request.count.yml
new file mode 100644
index 0000000000..116e9a3c12
--- /dev/null
+++ b/site/data/v2metrics/plus.http.request.count.yml
@@ -0,0 +1,30 @@
+
+---
+name: plus.http.request.count
+categories:
+- nginx
+description: The total number of client requests received from clients.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- server_zone
+- location_zone
diff --git a/site/data/v2metrics/plus.http.response.count.yml b/site/data/v2metrics/plus.http.response.count.yml
new file mode 100644
index 0000000000..b17e815926
--- /dev/null
+++ b/site/data/v2metrics/plus.http.response.count.yml
@@ -0,0 +1,30 @@
+
+---
+name: plus.http.response.count
+categories:
+- nginx
+description: The total number of responses sent to clients.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- server_zone
+- location_zone
diff --git a/site/data/v2metrics/plus.http.status.1xx.yml b/site/data/v2metrics/plus.http.status.1xx.yml
new file mode 100644
index 0000000000..d405166609
--- /dev/null
+++ b/site/data/v2metrics/plus.http.status.1xx.yml
@@ -0,0 +1,30 @@
+
+---
+name: plus.http.status.1xx
+categories:
+- nginx
+description: The number of responses with “1xx” status codes.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- server_zone
+- location_zone
diff --git a/site/data/v2metrics/plus.http.status.2xx.yml b/site/data/v2metrics/plus.http.status.2xx.yml
new file mode 100644
index 0000000000..4c0129cad1
--- /dev/null
+++ b/site/data/v2metrics/plus.http.status.2xx.yml
@@ -0,0 +1,30 @@
+
+---
+name: plus.http.status.2xx
+categories:
+- nginx
+description: The number of responses with “2xx” status codes.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- server_zone
+- location_zone
diff --git a/site/data/v2metrics/plus.http.status.3xx.yml b/site/data/v2metrics/plus.http.status.3xx.yml
new file mode 100644
index 0000000000..9ffcc73f69
--- /dev/null
+++ b/site/data/v2metrics/plus.http.status.3xx.yml
@@ -0,0 +1,30 @@
+
+---
+name: plus.http.status.3xx
+categories:
+- nginx
+description: The number of responses with “3xx” status codes.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- server_zone
+- location_zone
diff --git a/site/data/v2metrics/plus.http.status.4xx.yml b/site/data/v2metrics/plus.http.status.4xx.yml
new file mode 100644
index 0000000000..0d1bb4423e
--- /dev/null
+++ b/site/data/v2metrics/plus.http.status.4xx.yml
@@ -0,0 +1,30 @@
+
+---
+name: plus.http.status.4xx
+categories:
+- nginx
+description: The number of responses with “4xx” status codes.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- server_zone
+- location_zone
diff --git a/site/data/v2metrics/plus.http.status.5xx.yml b/site/data/v2metrics/plus.http.status.5xx.yml
new file mode 100644
index 0000000000..03fc88154b
--- /dev/null
+++ b/site/data/v2metrics/plus.http.status.5xx.yml
@@ -0,0 +1,30 @@
+
+---
+name: plus.http.status.5xx
+categories:
+- nginx
+description: The number of responses with “5xx” status codes.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- server_zone
+- location_zone
diff --git a/site/data/v2metrics/plus.http.status.discarded.yml b/site/data/v2metrics/plus.http.status.discarded.yml
new file mode 100644
index 0000000000..003ca2f3d5
--- /dev/null
+++ b/site/data/v2metrics/plus.http.status.discarded.yml
@@ -0,0 +1,30 @@
+
+---
+name: plus.http.status.discarded
+categories:
+- nginx
+description: The total number of requests completed without sending a response.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- server_zone
+- location_zone
diff --git a/site/data/v2metrics/plus.http.status.processing.yml b/site/data/v2metrics/plus.http.status.processing.yml
new file mode 100644
index 0000000000..bec68bc508
--- /dev/null
+++ b/site/data/v2metrics/plus.http.status.processing.yml
@@ -0,0 +1,29 @@
+
+---
+name: plus.http.status.processing
+categories:
+- nginx
+description: The number of client requests that are currently being processed.
+type: gauge
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- server_zone
diff --git a/site/data/v2metrics/plus.http.upstream.keepalives.yml b/site/data/v2metrics/plus.http.upstream.keepalives.yml
new file mode 100644
index 0000000000..8778f442eb
--- /dev/null
+++ b/site/data/v2metrics/plus.http.upstream.keepalives.yml
@@ -0,0 +1,39 @@
+
+---
+name: plus.http.upstream.keepalives
+categories:
+- nginx
+description: The current number of idle keepalive connections.
+type: gauge
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- site
+- environment
+- app
+- component
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.http.upstream.peers.bytes_rcvd.yml b/site/data/v2metrics/plus.http.upstream.peers.bytes_rcvd.yml
new file mode 100644
index 0000000000..f9cf4d53ef
--- /dev/null
+++ b/site/data/v2metrics/plus.http.upstream.peers.bytes_rcvd.yml
@@ -0,0 +1,41 @@
+
+---
+name: plus.http.upstream.peers.bytes_rcvd
+categories:
+- nginx
+description: The total number of bytes recieved from clients.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
+- site
+- environment
+- app
+- component
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.http.upstream.peers.bytes_sent.yml b/site/data/v2metrics/plus.http.upstream.peers.bytes_sent.yml
new file mode 100644
index 0000000000..bac53b474a
--- /dev/null
+++ b/site/data/v2metrics/plus.http.upstream.peers.bytes_sent.yml
@@ -0,0 +1,41 @@
+
+---
+name: plus.http.upstream.peers.bytes_sent
+categories:
+- nginx
+description: The total number of bytes sent to clients.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
+- site
+- environment
+- app
+- component
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.http.upstream.peers.conn.active.yml b/site/data/v2metrics/plus.http.upstream.peers.conn.active.yml
new file mode 100644
index 0000000000..f094ee6d00
--- /dev/null
+++ b/site/data/v2metrics/plus.http.upstream.peers.conn.active.yml
@@ -0,0 +1,41 @@
+
+---
+name: plus.http.upstream.peers.conn.active
+categories:
+- nginx
+description: The average number of active connections.
+type: gauge
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
+- site
+- environment
+- app
+- component
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.http.upstream.peers.fails.yml b/site/data/v2metrics/plus.http.upstream.peers.fails.yml
new file mode 100644
index 0000000000..24751a4fa1
--- /dev/null
+++ b/site/data/v2metrics/plus.http.upstream.peers.fails.yml
@@ -0,0 +1,41 @@
+
+---
+name: plus.http.upstream.peers.fails
+categories:
+- nginx
+description: The total number of unsuccessful attempts to communicate with the server.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
+- site
+- environment
+- app
+- component
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.http.upstream.peers.header_time.yml b/site/data/v2metrics/plus.http.upstream.peers.header_time.yml
new file mode 100644
index 0000000000..4cc1b7bb9c
--- /dev/null
+++ b/site/data/v2metrics/plus.http.upstream.peers.header_time.yml
@@ -0,0 +1,41 @@
+
+---
+name: plus.http.upstream.peers.header_time
+categories:
+- nginx
+description: The average time to get the response header from the server.
+type: gauge
+source: plus_status
+unit: milliseconds
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
+- site
+- environment
+- app
+- component
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.http.upstream.peers.health_checks.checks.yml b/site/data/v2metrics/plus.http.upstream.peers.health_checks.checks.yml
new file mode 100644
index 0000000000..85b9d4aea6
--- /dev/null
+++ b/site/data/v2metrics/plus.http.upstream.peers.health_checks.checks.yml
@@ -0,0 +1,41 @@
+
+---
+name: plus.http.upstream.peers.health_checks.checks
+categories:
+- nginx
+description: The total number of health check requests made.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
+- site
+- environment
+- app
+- component
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.http.upstream.peers.health_checks.fails.yml b/site/data/v2metrics/plus.http.upstream.peers.health_checks.fails.yml
new file mode 100644
index 0000000000..f1ae367519
--- /dev/null
+++ b/site/data/v2metrics/plus.http.upstream.peers.health_checks.fails.yml
@@ -0,0 +1,41 @@
+
+---
+name: plus.http.upstream.peers.health_checks.fails
+categories:
+- nginx
+description: The number of failed health checks.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
+- site
+- environment
+- app
+- component
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.http.upstream.peers.health_checks.unhealthy.yml b/site/data/v2metrics/plus.http.upstream.peers.health_checks.unhealthy.yml
new file mode 100644
index 0000000000..ffea2ed71c
--- /dev/null
+++ b/site/data/v2metrics/plus.http.upstream.peers.health_checks.unhealthy.yml
@@ -0,0 +1,41 @@
+
+---
+name: plus.http.upstream.peers.health_checks.unhealthy
+categories:
+- nginx
+description: How many times the server became unhealthy (state “unhealthy”).
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
+- site
+- environment
+- app
+- component
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.http.upstream.peers.request.count.yml b/site/data/v2metrics/plus.http.upstream.peers.request.count.yml
new file mode 100644
index 0000000000..b9e7b3db2b
--- /dev/null
+++ b/site/data/v2metrics/plus.http.upstream.peers.request.count.yml
@@ -0,0 +1,41 @@
+
+---
+name: plus.http.upstream.peers.request.count
+categories:
+- nginx
+description: The total number of client requests forwarded to this server.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
+- site
+- environment
+- app
+- component
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.http.upstream.peers.response.count.yml b/site/data/v2metrics/plus.http.upstream.peers.response.count.yml
new file mode 100644
index 0000000000..08c59b2afb
--- /dev/null
+++ b/site/data/v2metrics/plus.http.upstream.peers.response.count.yml
@@ -0,0 +1,41 @@
+
+---
+name: plus.http.upstream.peers.response.count
+categories:
+- nginx
+description: The total number of responses obtained from this server.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
+- site
+- environment
+- app
+- component
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.http.upstream.peers.response.time.yml b/site/data/v2metrics/plus.http.upstream.peers.response.time.yml
new file mode 100644
index 0000000000..2d1256c73b
--- /dev/null
+++ b/site/data/v2metrics/plus.http.upstream.peers.response.time.yml
@@ -0,0 +1,41 @@
+
+---
+name: plus.http.upstream.peers.response.time
+categories:
+- nginx
+description: The average time to get the full response from the server.
+type: gauge
+source: plus_status
+unit: milliseconds
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
+- site
+- environment
+- app
+- component
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.http.upstream.peers.state.checking.yml b/site/data/v2metrics/plus.http.upstream.peers.state.checking.yml
new file mode 100644
index 0000000000..7279ef32e2
--- /dev/null
+++ b/site/data/v2metrics/plus.http.upstream.peers.state.checking.yml
@@ -0,0 +1,43 @@
+
+---
+name: plus.http.upstream.peers.state.checking
+categories:
+- nginx
+description: Current state of upstream servers in deployment. If any of the upstream
+  servers in the deployment are checking then the value will be 1. If no upstream
+  server is checking then the value will be 0.
+type: gauge
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
+- site
+- environment
+- app
+- component
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.http.upstream.peers.state.down.yml b/site/data/v2metrics/plus.http.upstream.peers.state.down.yml
new file mode 100644
index 0000000000..0315524ba8
--- /dev/null
+++ b/site/data/v2metrics/plus.http.upstream.peers.state.down.yml
@@ -0,0 +1,43 @@
+
+---
+name: plus.http.upstream.peers.state.down
+categories:
+- nginx
+description: Current state of upstream servers in deployment. If any of the upstream
+  servers in the deployment are down then the value will be 1. If no upstream server
+  is down then the value will be 0.
+type: gauge
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
+- site
+- environment
+- app
+- component
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.http.upstream.peers.state.draining.yml b/site/data/v2metrics/plus.http.upstream.peers.state.draining.yml
new file mode 100644
index 0000000000..b164adfd19
--- /dev/null
+++ b/site/data/v2metrics/plus.http.upstream.peers.state.draining.yml
@@ -0,0 +1,43 @@
+
+---
+name: plus.http.upstream.peers.state.draining
+categories:
+- nginx
+description: Current state of upstream servers in deployment. If any of the upstream
+  servers in the deployment are draining then the value will be 1. If no upstream
+  server is draining then the value will be 0.
+type: gauge
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
+- site
+- environment
+- app
+- component
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.http.upstream.peers.state.unavail.yml b/site/data/v2metrics/plus.http.upstream.peers.state.unavail.yml
new file mode 100644
index 0000000000..2c7c02d6e3
--- /dev/null
+++ b/site/data/v2metrics/plus.http.upstream.peers.state.unavail.yml
@@ -0,0 +1,43 @@
+
+---
+name: plus.http.upstream.peers.state.unavail
+categories:
+- nginx
+description: Current state of upstream servers in deployment. If any of the upstream
+  servers in the deployment are unavail then the value will be 1. If no upstream server
+  is unavail then the value will be 0.
+type: gauge
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
+- site
+- environment
+- app
+- component
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.http.upstream.peers.state.unhealthy.yml b/site/data/v2metrics/plus.http.upstream.peers.state.unhealthy.yml
new file mode 100644
index 0000000000..a33daa013d
--- /dev/null
+++ b/site/data/v2metrics/plus.http.upstream.peers.state.unhealthy.yml
@@ -0,0 +1,43 @@
+
+---
+name: plus.http.upstream.peers.state.unhealthy
+categories:
+- nginx
+description: Current state of upstream servers in deployment. If any of the upstream
+  servers in the deployment are unhealthy then the value will be 1. If no upstream
+  server is unhealthy then the value will be 0.
+type: gauge
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
+- site
+- environment
+- app
+- component
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.http.upstream.peers.state.up.yml b/site/data/v2metrics/plus.http.upstream.peers.state.up.yml
new file mode 100644
index 0000000000..bb77c1e81f
--- /dev/null
+++ b/site/data/v2metrics/plus.http.upstream.peers.state.up.yml
@@ -0,0 +1,43 @@
+
+---
+name: plus.http.upstream.peers.state.up
+categories:
+- nginx
+description: Current state of upstream servers in deployment. If any of the upstream
+  servers in the deployment are up then the value will be 1. If no upstream server
+  is up then the value will be 0.
+type: gauge
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
+- site
+- environment
+- app
+- component
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.http.upstream.peers.status.1xx.yml b/site/data/v2metrics/plus.http.upstream.peers.status.1xx.yml
new file mode 100644
index 0000000000..487f0009fa
--- /dev/null
+++ b/site/data/v2metrics/plus.http.upstream.peers.status.1xx.yml
@@ -0,0 +1,41 @@
+
+---
+name: plus.http.upstream.peers.status.1xx
+categories:
+- nginx
+description: The number of responses with “1xx” status codes.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
+- site
+- environment
+- app
+- component
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.http.upstream.peers.status.2xx.yml b/site/data/v2metrics/plus.http.upstream.peers.status.2xx.yml
new file mode 100644
index 0000000000..c6698b28e9
--- /dev/null
+++ b/site/data/v2metrics/plus.http.upstream.peers.status.2xx.yml
@@ -0,0 +1,41 @@
+
+---
+name: plus.http.upstream.peers.status.2xx
+categories:
+- nginx
+description: The number of responses with “2xx” status codes.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
+- site
+- environment
+- app
+- component
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.http.upstream.peers.status.3xx.yml b/site/data/v2metrics/plus.http.upstream.peers.status.3xx.yml
new file mode 100644
index 0000000000..6809659112
--- /dev/null
+++ b/site/data/v2metrics/plus.http.upstream.peers.status.3xx.yml
@@ -0,0 +1,42 @@
+
+---
+name: plus.http.upstream.peers.status.3xx
+categories:
+- nginx
+description: The number of responses with “3xx” status codes.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
+- site
+- environment
+- app
+- component
+- environment_name
+- component_name
+- app_name
+- site_name
+
diff --git a/site/data/v2metrics/plus.http.upstream.peers.status.4xx.yml b/site/data/v2metrics/plus.http.upstream.peers.status.4xx.yml
new file mode 100644
index 0000000000..bea7731317
--- /dev/null
+++ b/site/data/v2metrics/plus.http.upstream.peers.status.4xx.yml
@@ -0,0 +1,41 @@
+
+---
+name: plus.http.upstream.peers.status.4xx
+categories:
+- nginx
+description: The number of responses with “4xx” status codes.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
+- site
+- environment
+- app
+- component
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.http.upstream.peers.status.5xx.yml b/site/data/v2metrics/plus.http.upstream.peers.status.5xx.yml
new file mode 100644
index 0000000000..e5b557de3e
--- /dev/null
+++ b/site/data/v2metrics/plus.http.upstream.peers.status.5xx.yml
@@ -0,0 +1,41 @@
+
+---
+name: plus.http.upstream.peers.status.5xx
+categories:
+- nginx
+description: The number of responses with “5xx” status codes.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
+- site
+- environment
+- app
+- component
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.http.upstream.peers.total.checking.yml b/site/data/v2metrics/plus.http.upstream.peers.total.checking.yml
new file mode 100644
index 0000000000..d98bc87dcf
--- /dev/null
+++ b/site/data/v2metrics/plus.http.upstream.peers.total.checking.yml
@@ -0,0 +1,39 @@
+
+---
+name: plus.http.upstream.peers.total.checking
+categories:
+- nginx
+description: The total number of peers with a state of "checking".
+type: gauge
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- site
+- environment
+- app
+- component
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.http.upstream.peers.total.down.yml b/site/data/v2metrics/plus.http.upstream.peers.total.down.yml
new file mode 100644
index 0000000000..be13fdc0f2
--- /dev/null
+++ b/site/data/v2metrics/plus.http.upstream.peers.total.down.yml
@@ -0,0 +1,39 @@
+
+---
+name: plus.http.upstream.peers.total.down
+categories:
+- nginx
+description: The total number of peers with a state of "down".
+type: gauge
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- site
+- environment
+- app
+- component
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.http.upstream.peers.total.draining.yml b/site/data/v2metrics/plus.http.upstream.peers.total.draining.yml
new file mode 100644
index 0000000000..24e9f0f14e
--- /dev/null
+++ b/site/data/v2metrics/plus.http.upstream.peers.total.draining.yml
@@ -0,0 +1,39 @@
+
+---
+name: plus.http.upstream.peers.total.draining
+categories:
+- nginx
+description: The total number of peers with a state of "draining".
+type: gauge
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- site
+- environment
+- app
+- component
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.http.upstream.peers.total.unavail.yml b/site/data/v2metrics/plus.http.upstream.peers.total.unavail.yml
new file mode 100644
index 0000000000..c2e531a173
--- /dev/null
+++ b/site/data/v2metrics/plus.http.upstream.peers.total.unavail.yml
@@ -0,0 +1,39 @@
+
+---
+name: plus.http.upstream.peers.total.unavail
+categories:
+- nginx
+description: The total number of peers with a state of "unavail".
+type: gauge
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- site
+- environment
+- app
+- component
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.http.upstream.peers.total.unhealthy.yml b/site/data/v2metrics/plus.http.upstream.peers.total.unhealthy.yml
new file mode 100644
index 0000000000..84fc1b5638
--- /dev/null
+++ b/site/data/v2metrics/plus.http.upstream.peers.total.unhealthy.yml
@@ -0,0 +1,39 @@
+
+---
+name: plus.http.upstream.peers.total.unhealthy
+categories:
+- nginx
+description: The total number of peers with a state of "unhealthy".
+type: gauge
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- site
+- environment
+- app
+- component
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.http.upstream.peers.total.up.yml b/site/data/v2metrics/plus.http.upstream.peers.total.up.yml
new file mode 100644
index 0000000000..55f5c15c6c
--- /dev/null
+++ b/site/data/v2metrics/plus.http.upstream.peers.total.up.yml
@@ -0,0 +1,39 @@
+
+---
+name: plus.http.upstream.peers.total.up
+categories:
+- nginx
+description: The total number of peers with a state of "up".
+type: gauge
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- site
+- environment
+- app
+- component
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.http.upstream.peers.unavail.yml b/site/data/v2metrics/plus.http.upstream.peers.unavail.yml
new file mode 100644
index 0000000000..f77838040b
--- /dev/null
+++ b/site/data/v2metrics/plus.http.upstream.peers.unavail.yml
@@ -0,0 +1,42 @@
+
+---
+name: plus.http.upstream.peers.unavail
+categories:
+- nginx
+description: How many times the server became unavailable for client requests (state
+  “unavail”) due to the number of unsuccessful attempts reaching the max_fails threshold.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
+- site
+- environment
+- app
+- component
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.http.upstream.queue.maxsize.yml b/site/data/v2metrics/plus.http.upstream.queue.maxsize.yml
new file mode 100644
index 0000000000..0046dc980e
--- /dev/null
+++ b/site/data/v2metrics/plus.http.upstream.queue.maxsize.yml
@@ -0,0 +1,38 @@
+
+---
+name: plus.http.upstream.queue.maxsize
+categories:
+- nginx
+description: The maximum number of requests that can be in the queue at the same time.
+type: gauge
+source: plus_status
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- site
+- environment
+- app
+- component
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.http.upstream.queue.overflows.yml b/site/data/v2metrics/plus.http.upstream.queue.overflows.yml
new file mode 100644
index 0000000000..93d63098c1
--- /dev/null
+++ b/site/data/v2metrics/plus.http.upstream.queue.overflows.yml
@@ -0,0 +1,39 @@
+
+---
+name: plus.http.upstream.queue.overflows
+categories:
+- nginx
+description: The total number of requests rejected due to the queue overflow.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- site
+- environment
+- app
+- component
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.http.upstream.queue.size.yml b/site/data/v2metrics/plus.http.upstream.queue.size.yml
new file mode 100644
index 0000000000..12550d0313
--- /dev/null
+++ b/site/data/v2metrics/plus.http.upstream.queue.size.yml
@@ -0,0 +1,38 @@
+
+---
+name: plus.http.upstream.queue.size
+categories:
+- nginx
+description: The current number of requests in the queue.
+type: gauge
+source: plus_status
+unit: integer
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- site
+- environment
+- app
+- component
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.http.upstream.zombies.yml b/site/data/v2metrics/plus.http.upstream.zombies.yml
new file mode 100644
index 0000000000..e035b68313
--- /dev/null
+++ b/site/data/v2metrics/plus.http.upstream.zombies.yml
@@ -0,0 +1,40 @@
+
+---
+name: plus.http.upstream.zombies
+categories:
+- nginx
+description: The current number of servers removed from the group but still processing
+  active client requests.
+type: gauge
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- site
+- environment
+- app
+- component
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.instance.count.yml b/site/data/v2metrics/plus.instance.count.yml
new file mode 100644
index 0000000000..2ade09dfb0
--- /dev/null
+++ b/site/data/v2metrics/plus.instance.count.yml
@@ -0,0 +1,26 @@
+
+---
+name: plus.instance.count
+categories:
+  - nginx
+description: "Total number of NGINX PLUS."
+type: gauge
+source: psutil
+unit: integer
+visible: true
+counted: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
diff --git a/site/data/v2metrics/plus.slab.pages.free.yml b/site/data/v2metrics/plus.slab.pages.free.yml
new file mode 100644
index 0000000000..b5895c1140
--- /dev/null
+++ b/site/data/v2metrics/plus.slab.pages.free.yml
@@ -0,0 +1,32 @@
+
+---
+name: plus.slab.pages.free
+categories:
+- nginx
+description: The current number of free memory pages.
+type: gauge
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
diff --git a/site/data/v2metrics/plus.slab.pages.pct_used.yml b/site/data/v2metrics/plus.slab.pages.pct_used.yml
new file mode 100644
index 0000000000..b26384e016
--- /dev/null
+++ b/site/data/v2metrics/plus.slab.pages.pct_used.yml
@@ -0,0 +1,32 @@
+
+---
+name: plus.slab.pages.pct_used
+categories:
+- nginx
+description: The current percentage of used memory pages.
+type: gauge
+source: plus_status
+unit: percent
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
diff --git a/site/data/v2metrics/plus.slab.pages.total.yml b/site/data/v2metrics/plus.slab.pages.total.yml
new file mode 100644
index 0000000000..371b485ecf
--- /dev/null
+++ b/site/data/v2metrics/plus.slab.pages.total.yml
@@ -0,0 +1,32 @@
+
+---
+name: plus.slab.pages.total
+categories:
+- nginx
+description: The total number of memory pages (free and used).
+type: gauge
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
diff --git a/site/data/v2metrics/plus.slab.pages.used.yml b/site/data/v2metrics/plus.slab.pages.used.yml
new file mode 100644
index 0000000000..af4aff40a0
--- /dev/null
+++ b/site/data/v2metrics/plus.slab.pages.used.yml
@@ -0,0 +1,32 @@
+
+---
+name: plus.slab.pages.used
+categories:
+- nginx
+description: The current number of used memory pages.
+type: gauge
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
diff --git a/site/data/v2metrics/plus.ssl.failed.yml b/site/data/v2metrics/plus.ssl.failed.yml
new file mode 100644
index 0000000000..170b75672f
--- /dev/null
+++ b/site/data/v2metrics/plus.ssl.failed.yml
@@ -0,0 +1,28 @@
+
+---
+name: plus.ssl.failed
+categories:
+- nginx
+description: The total number of failed SSL handshakes.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/plus.ssl.handshakes.yml b/site/data/v2metrics/plus.ssl.handshakes.yml
new file mode 100644
index 0000000000..217d022b9c
--- /dev/null
+++ b/site/data/v2metrics/plus.ssl.handshakes.yml
@@ -0,0 +1,28 @@
+
+---
+name: plus.ssl.handshakes
+categories:
+- nginx
+description: The total number of successful SSL handshakes.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/plus.ssl.reuses.yml b/site/data/v2metrics/plus.ssl.reuses.yml
new file mode 100644
index 0000000000..5d411c55bc
--- /dev/null
+++ b/site/data/v2metrics/plus.ssl.reuses.yml
@@ -0,0 +1,28 @@
+
+---
+name: plus.ssl.reuses
+categories:
+- nginx
+description: The total number of session reuses during SSL handshake.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/plus.stream.bytes_rcvd.yml b/site/data/v2metrics/plus.stream.bytes_rcvd.yml
new file mode 100644
index 0000000000..0a7fda3825
--- /dev/null
+++ b/site/data/v2metrics/plus.stream.bytes_rcvd.yml
@@ -0,0 +1,29 @@
+
+---
+name: plus.stream.bytes_rcvd
+categories:
+- nginx
+description: The total number of bytes received from clients.
+type: counter
+source: plus_status
+unit: bytes
+rate: net_io_rate
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- server_zone
diff --git a/site/data/v2metrics/plus.stream.bytes_sent.yml b/site/data/v2metrics/plus.stream.bytes_sent.yml
new file mode 100644
index 0000000000..d541038766
--- /dev/null
+++ b/site/data/v2metrics/plus.stream.bytes_sent.yml
@@ -0,0 +1,29 @@
+
+---
+name: plus.stream.bytes_sent
+categories:
+- nginx
+description: The total number of bytes sent to clients.
+type: counter
+source: plus_status
+unit: bytes
+rate: net_io_rate
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- server_zone
diff --git a/site/data/v2metrics/plus.stream.connections.yml b/site/data/v2metrics/plus.stream.connections.yml
new file mode 100644
index 0000000000..718e240204
--- /dev/null
+++ b/site/data/v2metrics/plus.stream.connections.yml
@@ -0,0 +1,29 @@
+
+---
+name: plus.stream.connections
+categories:
+- nginx
+description: The total number of connections accepted from clients.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- server_zone
diff --git a/site/data/v2metrics/plus.stream.discarded.yml b/site/data/v2metrics/plus.stream.discarded.yml
new file mode 100644
index 0000000000..3d685354ea
--- /dev/null
+++ b/site/data/v2metrics/plus.stream.discarded.yml
@@ -0,0 +1,30 @@
+
+---
+name: plus.stream.discarded
+categories:
+- nginx
+- stream
+description: Total number of connections completed without creating a session.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- server_zone
diff --git a/site/data/v2metrics/plus.stream.processing.yml b/site/data/v2metrics/plus.stream.processing.yml
new file mode 100644
index 0000000000..6aa613111f
--- /dev/null
+++ b/site/data/v2metrics/plus.stream.processing.yml
@@ -0,0 +1,29 @@
+
+---
+name: plus.stream.processing
+categories:
+- nginx
+description: The number of client connections that are currently being processed.
+type: gauge
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- server_zone
diff --git a/site/data/v2metrics/plus.stream.status.2xx.yml b/site/data/v2metrics/plus.stream.status.2xx.yml
new file mode 100644
index 0000000000..5890f69caf
--- /dev/null
+++ b/site/data/v2metrics/plus.stream.status.2xx.yml
@@ -0,0 +1,29 @@
+
+---
+name: plus.stream.status.2xx
+categories:
+- nginx
+description: The total number of sessions completed with status codes “2xx”.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- server_zone
diff --git a/site/data/v2metrics/plus.stream.status.4xx.yml b/site/data/v2metrics/plus.stream.status.4xx.yml
new file mode 100644
index 0000000000..3889cbaa5a
--- /dev/null
+++ b/site/data/v2metrics/plus.stream.status.4xx.yml
@@ -0,0 +1,29 @@
+
+---
+name: plus.stream.status.4xx
+categories:
+- nginx
+description: The total number of sessions completed with status codes “4xx”.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- server_zone
diff --git a/site/data/v2metrics/plus.stream.status.5xx.yml b/site/data/v2metrics/plus.stream.status.5xx.yml
new file mode 100644
index 0000000000..742a70a9e0
--- /dev/null
+++ b/site/data/v2metrics/plus.stream.status.5xx.yml
@@ -0,0 +1,29 @@
+
+---
+name: plus.stream.status.5xx
+categories:
+- nginx
+description: The total number of sessions completed with status codes “2xx”.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- server_zone
diff --git a/site/data/v2metrics/plus.stream.status.total.yml b/site/data/v2metrics/plus.stream.status.total.yml
new file mode 100644
index 0000000000..2161d927f8
--- /dev/null
+++ b/site/data/v2metrics/plus.stream.status.total.yml
@@ -0,0 +1,29 @@
+
+---
+name: plus.stream.status.total
+categories:
+- nginx
+description: The total number of completed client sessions.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- server_zone
diff --git a/site/data/v2metrics/plus.stream.upstream.peers.bytes_rcvd.yml b/site/data/v2metrics/plus.stream.upstream.peers.bytes_rcvd.yml
new file mode 100644
index 0000000000..c875c6cf7e
--- /dev/null
+++ b/site/data/v2metrics/plus.stream.upstream.peers.bytes_rcvd.yml
@@ -0,0 +1,41 @@
+
+---
+name: plus.stream.upstream.peers.bytes_rcvd
+categories:
+- nginx
+description: The total number of bytes received from this server.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
+- environment
+- app
+- component
+- site
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.stream.upstream.peers.bytes_sent.yml b/site/data/v2metrics/plus.stream.upstream.peers.bytes_sent.yml
new file mode 100644
index 0000000000..9e651db41f
--- /dev/null
+++ b/site/data/v2metrics/plus.stream.upstream.peers.bytes_sent.yml
@@ -0,0 +1,41 @@
+
+---
+name: plus.stream.upstream.peers.bytes_sent
+categories:
+- nginx
+description: The total number of bytes sent to this server.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
+- environment
+- app
+- component
+- site
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.stream.upstream.peers.conn.active.yml b/site/data/v2metrics/plus.stream.upstream.peers.conn.active.yml
new file mode 100644
index 0000000000..86e990a0cb
--- /dev/null
+++ b/site/data/v2metrics/plus.stream.upstream.peers.conn.active.yml
@@ -0,0 +1,41 @@
+
+---
+name: plus.stream.upstream.peers.conn.active
+categories:
+- nginx
+description: The current number of connections.
+type: gauge
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
+- environment
+- app
+- component
+- site
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.stream.upstream.peers.conn.count.yml b/site/data/v2metrics/plus.stream.upstream.peers.conn.count.yml
new file mode 100644
index 0000000000..9f2bd41293
--- /dev/null
+++ b/site/data/v2metrics/plus.stream.upstream.peers.conn.count.yml
@@ -0,0 +1,41 @@
+
+---
+name: plus.stream.upstream.peers.conn.count
+categories:
+- nginx
+description: The total number of client connections forwarded to this server.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
+- environment
+- app
+- component
+- site
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.stream.upstream.peers.connect_time.yml b/site/data/v2metrics/plus.stream.upstream.peers.connect_time.yml
new file mode 100644
index 0000000000..96eeeeda2e
--- /dev/null
+++ b/site/data/v2metrics/plus.stream.upstream.peers.connect_time.yml
@@ -0,0 +1,41 @@
+
+---
+name: plus.stream.upstream.peers.connect_time
+categories:
+- nginx
+description: The average time to connect to the upstream server.
+type: gauge
+source: plus_status
+unit: milliseconds
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
+- environment
+- app
+- component
+- site
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.stream.upstream.peers.fails.yml b/site/data/v2metrics/plus.stream.upstream.peers.fails.yml
new file mode 100644
index 0000000000..d0bebf0395
--- /dev/null
+++ b/site/data/v2metrics/plus.stream.upstream.peers.fails.yml
@@ -0,0 +1,41 @@
+
+---
+name: plus.stream.upstream.peers.fails
+categories:
+- nginx
+description: The total number of peers with a state of "fails".
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
+- environment
+- app
+- component
+- site
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.stream.upstream.peers.health_checks.checks.yml b/site/data/v2metrics/plus.stream.upstream.peers.health_checks.checks.yml
new file mode 100644
index 0000000000..b725f92e2b
--- /dev/null
+++ b/site/data/v2metrics/plus.stream.upstream.peers.health_checks.checks.yml
@@ -0,0 +1,41 @@
+
+---
+name: plus.stream.upstream.peers.health_checks.checks
+categories:
+- nginx
+description: The total number of health check requests made.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
+- environment
+- app
+- component
+- site
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.stream.upstream.peers.health_checks.fails.yml b/site/data/v2metrics/plus.stream.upstream.peers.health_checks.fails.yml
new file mode 100644
index 0000000000..2a5f7b1590
--- /dev/null
+++ b/site/data/v2metrics/plus.stream.upstream.peers.health_checks.fails.yml
@@ -0,0 +1,41 @@
+
+---
+name: plus.stream.upstream.peers.health_checks.fails
+categories:
+- nginx
+description: The number of failed health checks.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
+- environment
+- app
+- component
+- site
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.stream.upstream.peers.health_checks.unhealthy.yml b/site/data/v2metrics/plus.stream.upstream.peers.health_checks.unhealthy.yml
new file mode 100644
index 0000000000..60bc24987e
--- /dev/null
+++ b/site/data/v2metrics/plus.stream.upstream.peers.health_checks.unhealthy.yml
@@ -0,0 +1,41 @@
+
+---
+name: plus.stream.upstream.peers.health_checks.unhealthy
+categories:
+- nginx
+description: How many times the server became unhealthy (state “unhealthy”).
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
+- environment
+- app
+- component
+- site
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.stream.upstream.peers.response.time.yml b/site/data/v2metrics/plus.stream.upstream.peers.response.time.yml
new file mode 100644
index 0000000000..0e2f34c39d
--- /dev/null
+++ b/site/data/v2metrics/plus.stream.upstream.peers.response.time.yml
@@ -0,0 +1,41 @@
+
+---
+name: plus.stream.upstream.peers.response.time
+categories:
+- nginx
+description: The average time to receive the last byte of data.
+type: gauge
+source: plus_status
+unit: milliseconds
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
+- environment
+- app
+- component
+- site
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.stream.upstream.peers.state.checking.yml b/site/data/v2metrics/plus.stream.upstream.peers.state.checking.yml
new file mode 100644
index 0000000000..dc877310d7
--- /dev/null
+++ b/site/data/v2metrics/plus.stream.upstream.peers.state.checking.yml
@@ -0,0 +1,43 @@
+
+---
+name: plus.stream.upstream.peers.state.checking
+categories:
+- nginx
+description: Current state of upstream servers in deployment. If any of the upstream
+  servers in the deployment are checking then the value will be 1. If no upstream
+  server is checking then the value will be 0.
+type: gauge
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
+- environment
+- app
+- component
+- site
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.stream.upstream.peers.state.down.yml b/site/data/v2metrics/plus.stream.upstream.peers.state.down.yml
new file mode 100644
index 0000000000..38a4b12b34
--- /dev/null
+++ b/site/data/v2metrics/plus.stream.upstream.peers.state.down.yml
@@ -0,0 +1,43 @@
+
+---
+name: plus.stream.upstream.peers.state.down
+categories:
+- nginx
+description: Current state of upstream servers in deployment. If any of the upstream
+  servers in the deployment are down then the value will be 1. If no upstream server
+  is down then the value will be 0.
+type: gauge
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
+- environment
+- app
+- component
+- site
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.stream.upstream.peers.state.draining.yml b/site/data/v2metrics/plus.stream.upstream.peers.state.draining.yml
new file mode 100644
index 0000000000..cfe7cafd71
--- /dev/null
+++ b/site/data/v2metrics/plus.stream.upstream.peers.state.draining.yml
@@ -0,0 +1,43 @@
+
+---
+name: plus.stream.upstream.peers.state.draining
+categories:
+- nginx
+description: Current state of upstream servers in deployment. If any of the upstream
+  servers in the deployment are draining then the value will be 1. If no upstream
+  server is draining then the value will be 0.
+type: gauge
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
+- environment
+- app
+- component
+- site
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.stream.upstream.peers.state.unavail.yml b/site/data/v2metrics/plus.stream.upstream.peers.state.unavail.yml
new file mode 100644
index 0000000000..01af8552ea
--- /dev/null
+++ b/site/data/v2metrics/plus.stream.upstream.peers.state.unavail.yml
@@ -0,0 +1,43 @@
+
+---
+name: plus.stream.upstream.peers.state.unavail
+categories:
+- nginx
+description: Current state of upstream servers in deployment. If any of the upstream
+  servers in the deployment are unavail then the value will be 1. If no upstream server
+  is unavail then the value will be 0.
+type: gauge
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
+- environment
+- app
+- component
+- site
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.stream.upstream.peers.state.unhealthy.yml b/site/data/v2metrics/plus.stream.upstream.peers.state.unhealthy.yml
new file mode 100644
index 0000000000..73e92dd699
--- /dev/null
+++ b/site/data/v2metrics/plus.stream.upstream.peers.state.unhealthy.yml
@@ -0,0 +1,43 @@
+
+---
+name: plus.stream.upstream.peers.state.unhealthy
+categories:
+- nginx
+description: Current state of upstream servers in deployment. If any of the upstream
+  servers in the deployment are unhealthy then the value will be 1. If no upstream
+  server is unhealthy then the value will be 0.
+type: gauge
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
+- environment
+- app
+- component
+- site
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.stream.upstream.peers.state.up.yml b/site/data/v2metrics/plus.stream.upstream.peers.state.up.yml
new file mode 100644
index 0000000000..eab6f3abf1
--- /dev/null
+++ b/site/data/v2metrics/plus.stream.upstream.peers.state.up.yml
@@ -0,0 +1,43 @@
+
+---
+name: plus.stream.upstream.peers.state.up
+categories:
+- nginx
+description: Current state of upstream servers in deployment. If any of the upstream
+  servers in the deployment are up then the value will be 1. If no upstream server
+  is up then the value will be 0.
+type: gauge
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
+- environment
+- app
+- component
+- site
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.stream.upstream.peers.total.checking.yml b/site/data/v2metrics/plus.stream.upstream.peers.total.checking.yml
new file mode 100644
index 0000000000..bbe579a3b4
--- /dev/null
+++ b/site/data/v2metrics/plus.stream.upstream.peers.total.checking.yml
@@ -0,0 +1,39 @@
+
+---
+name: plus.stream.upstream.peers.total.checking
+categories:
+- nginx
+description: The total number of peers with a state of "checking".
+type: gauge
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- environment
+- app
+- component
+- site
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.stream.upstream.peers.total.down.yml b/site/data/v2metrics/plus.stream.upstream.peers.total.down.yml
new file mode 100644
index 0000000000..c791ae2e21
--- /dev/null
+++ b/site/data/v2metrics/plus.stream.upstream.peers.total.down.yml
@@ -0,0 +1,39 @@
+
+---
+name: plus.stream.upstream.peers.total.down
+categories:
+- nginx
+description: The total number of peers with a state of "down".
+type: gauge
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- environment
+- app
+- component
+- site
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.stream.upstream.peers.total.draining.yml b/site/data/v2metrics/plus.stream.upstream.peers.total.draining.yml
new file mode 100644
index 0000000000..fba16f6eb8
--- /dev/null
+++ b/site/data/v2metrics/plus.stream.upstream.peers.total.draining.yml
@@ -0,0 +1,39 @@
+
+---
+name: plus.stream.upstream.peers.total.draining
+categories:
+- nginx
+description: The total number of peers with a state of "draining".
+type: gauge
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- environment
+- app
+- component
+- site
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.stream.upstream.peers.total.unavail.yml b/site/data/v2metrics/plus.stream.upstream.peers.total.unavail.yml
new file mode 100644
index 0000000000..294222ccd8
--- /dev/null
+++ b/site/data/v2metrics/plus.stream.upstream.peers.total.unavail.yml
@@ -0,0 +1,40 @@
+
+---
+name: plus.stream.upstream.peers.total.unavail
+categories:
+- nginx
+description: How many times the server became unavailable for client connections (state
+  “unavail”) due to the number of unsuccessful attempts reaching the max_fails threshold.
+type: gauge
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- environment
+- app
+- component
+- site
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.stream.upstream.peers.total.unhealthy.yml b/site/data/v2metrics/plus.stream.upstream.peers.total.unhealthy.yml
new file mode 100644
index 0000000000..2b5fbff0b2
--- /dev/null
+++ b/site/data/v2metrics/plus.stream.upstream.peers.total.unhealthy.yml
@@ -0,0 +1,39 @@
+
+---
+name: plus.stream.upstream.peers.total.unhealthy
+categories:
+- nginx
+description: The total number of peers with a state of "unhealthy".
+type: gauge
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- environment
+- app
+- component
+- site
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.stream.upstream.peers.total.up.yml b/site/data/v2metrics/plus.stream.upstream.peers.total.up.yml
new file mode 100644
index 0000000000..1c6b48a339
--- /dev/null
+++ b/site/data/v2metrics/plus.stream.upstream.peers.total.up.yml
@@ -0,0 +1,39 @@
+
+---
+name: plus.stream.upstream.peers.total.up
+categories:
+- nginx
+description: The total number of peers with a state of "up".
+type: gauge
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- environment
+- app
+- component
+- site
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.stream.upstream.peers.ttfb.yml b/site/data/v2metrics/plus.stream.upstream.peers.ttfb.yml
new file mode 100644
index 0000000000..ada330b9a3
--- /dev/null
+++ b/site/data/v2metrics/plus.stream.upstream.peers.ttfb.yml
@@ -0,0 +1,41 @@
+
+---
+name: plus.stream.upstream.peers.ttfb
+categories:
+- nginx
+description: The average time to receive the first byte of data.
+type: gauge
+source: plus_status
+unit: milliseconds
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
+- environment
+- app
+- component
+- site
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.stream.upstream.peers.unavail.yml b/site/data/v2metrics/plus.stream.upstream.peers.unavail.yml
new file mode 100644
index 0000000000..5ee6409fd0
--- /dev/null
+++ b/site/data/v2metrics/plus.stream.upstream.peers.unavail.yml
@@ -0,0 +1,42 @@
+
+---
+name: plus.stream.upstream.peers.unavail
+categories:
+- nginx
+description: How many times the server became unavailable for client connections (state
+  “unavail”) due to the number of unsuccessful attempts reaching the max_fails threshold.
+type: counter
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- peer.name
+- peer.address
+- environment
+- app
+- component
+- site
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/plus.stream.upstream.zombies.yml b/site/data/v2metrics/plus.stream.upstream.zombies.yml
new file mode 100644
index 0000000000..61ded29502
--- /dev/null
+++ b/site/data/v2metrics/plus.stream.upstream.zombies.yml
@@ -0,0 +1,40 @@
+
+---
+name: plus.stream.upstream.zombies
+categories:
+- nginx
+description: The current number of servers removed from the group but still processing
+  active client connections.
+type: gauge
+source: plus_status
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+- adm
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
+- upstream
+- upstream_zone
+- environment
+- app
+- component
+- site
+- environment_name
+- component_name
+- app_name
+- site_name
diff --git a/site/data/v2metrics/stream.bytes_rcvd.yml b/site/data/v2metrics/stream.bytes_rcvd.yml
new file mode 100644
index 0000000000..c32893ce6d
--- /dev/null
+++ b/site/data/v2metrics/stream.bytes_rcvd.yml
@@ -0,0 +1,49 @@
+
+---
+name: stream.bytes_rcvd
+categories:
+  - advanced-metrics
+description: The total number of bytes received from clients.
+type: counter
+source: advanced-metrics-module
+unit: bytes
+rate: net_io_rate
+visible: true
+compound_payload: "false"
+modules:
+  - adm
+  - acm
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - system.tags
+  - instance_group
+  - display_name
+  - nginx_id
+  - http.upstream_addr
+  - family
+  - proxied_protocol
+  - app
+  - environment
+  - component
+  - gateway
+  - acm_api_proxy_hostname
+  - acm_api_proxy_name
+  - acm_api_proxy_version
+  - acm_environments_name
+  - acm_environments_type
+  - acm_infra_workspaces_name
+  - acm_service_workspaces_name
+  - site
+  - environment_name
+  - gateway_name
+  - component_name
+  - app_name
+  - site_name
diff --git a/site/data/v2metrics/stream.bytes_sent.yml b/site/data/v2metrics/stream.bytes_sent.yml
new file mode 100644
index 0000000000..bc854cd506
--- /dev/null
+++ b/site/data/v2metrics/stream.bytes_sent.yml
@@ -0,0 +1,49 @@
+
+---
+name: stream.bytes_sent
+categories:
+  - advanced-metrics
+description: The total number of bytes sent from clients.
+type: counter
+source: advanced-metrics-module
+unit: bytes
+rate: net_io_rate
+visible: true
+compound_payload: "false"
+modules:
+  - adm
+  - acm
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - system.tags
+  - instance_group
+  - display_name
+  - nginx_id
+  - http.upstream_addr
+  - family
+  - proxied_protocol
+  - app
+  - environment
+  - component
+  - gateway
+  - acm_api_proxy_hostname
+  - acm_api_proxy_name
+  - acm_api_proxy_version
+  - acm_environments_name
+  - acm_environments_type
+  - acm_infra_workspaces_name
+  - acm_service_workspaces_name
+  - site
+  - environment_name
+  - gateway_name
+  - component_name
+  - app_name
+  - site_name
\ No newline at end of file
diff --git a/site/data/v2metrics/stream.connection_duration.yml b/site/data/v2metrics/stream.connection_duration.yml
new file mode 100644
index 0000000000..b284dbe007
--- /dev/null
+++ b/site/data/v2metrics/stream.connection_duration.yml
@@ -0,0 +1,49 @@
+
+---
+name: stream.connection_duration
+categories:
+  - advanced-metrics
+description: The duration of connection with the proxy.
+type: gauge
+source: advanced-metrics-module
+unit: milliseconds
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+  - adm
+  - acm
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - system.tags
+  - instance_group
+  - display_name
+  - nginx_id
+  - http.upstream_addr
+  - family
+  - proxied_protocol
+  - app
+  - environment
+  - component
+  - gateway
+  - acm_api_proxy_hostname
+  - acm_api_proxy_name
+  - acm_api_proxy_version
+  - acm_environments_name
+  - acm_environments_type
+  - acm_infra_workspaces_name
+  - acm_service_workspaces_name
+  - site
+  - environment_name
+  - gateway_name
+  - component_name
+  - app_name
+  - site_name
diff --git a/site/data/v2metrics/stream.connections.yml b/site/data/v2metrics/stream.connections.yml
new file mode 100644
index 0000000000..0fca589011
--- /dev/null
+++ b/site/data/v2metrics/stream.connections.yml
@@ -0,0 +1,49 @@
+
+---
+name: stream.connections
+categories:
+  - advanced-metrics
+description: The total number of connections accepted from clients.
+type: gauge
+source: advanced-metrics-module
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+  - adm
+  - acm
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - system.tags
+  - instance_group
+  - display_name
+  - nginx_id
+  - http.upstream_addr
+  - family
+  - proxied_protocol
+  - app
+  - environment
+  - component
+  - gateway
+  - acm_api_proxy_hostname
+  - acm_api_proxy_name
+  - acm_api_proxy_version
+  - acm_environments_name
+  - acm_environments_type
+  - acm_infra_workspaces_name
+  - acm_service_workspaces_name
+  - site
+  - environment_name
+  - gateway_name
+  - component_name
+  - app_name
+  - site_name
diff --git a/site/data/v2metrics/system.cpu.idle.yml b/site/data/v2metrics/system.cpu.idle.yml
new file mode 100644
index 0000000000..aa2e17e373
--- /dev/null
+++ b/site/data/v2metrics/system.cpu.idle.yml
@@ -0,0 +1,28 @@
+
+---
+name: system.cpu.idle
+categories:
+- system
+description: System CPU utilization.
+type: gauge
+counted: true
+source: psutil
+unit: percent
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/system.cpu.iowait.yml b/site/data/v2metrics/system.cpu.iowait.yml
new file mode 100644
index 0000000000..afbb48dab7
--- /dev/null
+++ b/site/data/v2metrics/system.cpu.iowait.yml
@@ -0,0 +1,28 @@
+
+---
+name: system.cpu.iowait
+categories:
+- system
+description: System CPU utilization.
+type: gauge
+counted: true
+source: psutil
+unit: percent
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/system.cpu.stolen.yml b/site/data/v2metrics/system.cpu.stolen.yml
new file mode 100644
index 0000000000..0ffa1e906c
--- /dev/null
+++ b/site/data/v2metrics/system.cpu.stolen.yml
@@ -0,0 +1,29 @@
+
+---
+name: system.cpu.stolen
+categories:
+- system
+description: System CPU stolen. Represents time when the real CPU was not available
+  to the current VM.
+type: gauge
+counted: true
+source: psutil
+unit: percent
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/system.cpu.system.yml b/site/data/v2metrics/system.cpu.system.yml
new file mode 100644
index 0000000000..afaf4d9ffb
--- /dev/null
+++ b/site/data/v2metrics/system.cpu.system.yml
@@ -0,0 +1,28 @@
+
+---
+name: system.cpu.system
+categories:
+- system
+description: System CPU utilization.
+type: gauge
+counted: true
+source: psutil
+unit: percent
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/system.cpu.user.yml b/site/data/v2metrics/system.cpu.user.yml
new file mode 100644
index 0000000000..fdf7a46877
--- /dev/null
+++ b/site/data/v2metrics/system.cpu.user.yml
@@ -0,0 +1,28 @@
+
+---
+name: system.cpu.user
+categories:
+- system
+description: System CPU utilization.
+type: gauge
+counted: true
+source: psutil
+unit: percent
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/system.disk.free.yml b/site/data/v2metrics/system.disk.free.yml
new file mode 100644
index 0000000000..416b58b6ea
--- /dev/null
+++ b/site/data/v2metrics/system.disk.free.yml
@@ -0,0 +1,29 @@
+
+---
+name: system.disk.free
+categories:
+  - system
+description: System disk usage statistics.
+type: gauge
+counted: true
+source: psutil
+unit: bytes
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - mount_point
+  - instance_group
+  - system.tags
diff --git a/site/data/v2metrics/system.disk.in_use.yml b/site/data/v2metrics/system.disk.in_use.yml
new file mode 100644
index 0000000000..5e4231142b
--- /dev/null
+++ b/site/data/v2metrics/system.disk.in_use.yml
@@ -0,0 +1,29 @@
+
+---
+name: system.disk.in_use
+categories:
+  - system
+description: System disk usage statistics, percentage.
+type: gauge
+counted: true
+source: psutil
+unit: percent
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - mount_point
+  - instance_group
+  - system.tags
diff --git a/site/data/v2metrics/system.disk.total.yml b/site/data/v2metrics/system.disk.total.yml
new file mode 100644
index 0000000000..916bc19d71
--- /dev/null
+++ b/site/data/v2metrics/system.disk.total.yml
@@ -0,0 +1,29 @@
+
+---
+name: system.disk.total
+categories:
+  - system
+description: System disk usage statistics.
+type: gauge
+counted: true
+source: psutil
+unit: bytes
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - mount_point
+  - instance_group
+  - system.tags
diff --git a/site/data/v2metrics/system.disk.used.yml b/site/data/v2metrics/system.disk.used.yml
new file mode 100644
index 0000000000..3459f13129
--- /dev/null
+++ b/site/data/v2metrics/system.disk.used.yml
@@ -0,0 +1,29 @@
+
+---
+name: system.disk.used
+categories:
+  - system
+description: System disk usage statistics.
+type: gauge
+counted: true
+source: psutil
+unit: bytes
+visible: true
+compound_payload: "false"
+modules:
+  - platform
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - mount_point
+  - instance_group
+  - system.tags
diff --git a/site/data/v2metrics/system.io.iops_r.yml b/site/data/v2metrics/system.io.iops_r.yml
new file mode 100644
index 0000000000..8869e3e76d
--- /dev/null
+++ b/site/data/v2metrics/system.io.iops_r.yml
@@ -0,0 +1,30 @@
+
+---
+name: system.io.iops_r
+categories:
+- system
+description: Number of reads per sampling window.
+type: counter
+counted: true
+source: psutil
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- mount_point
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/system.io.iops_w.yml b/site/data/v2metrics/system.io.iops_w.yml
new file mode 100644
index 0000000000..43c9a23278
--- /dev/null
+++ b/site/data/v2metrics/system.io.iops_w.yml
@@ -0,0 +1,30 @@
+
+---
+name: system.io.iops_w
+categories:
+- system
+description: Number of writes per sampling window.
+type: counter
+counted: true
+source: psutil
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- mount_point
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/system.io.kbs_r.yml b/site/data/v2metrics/system.io.kbs_r.yml
new file mode 100644
index 0000000000..4b86ac82af
--- /dev/null
+++ b/site/data/v2metrics/system.io.kbs_r.yml
@@ -0,0 +1,30 @@
+
+---
+name: system.io.kbs_r
+categories:
+- system
+description: Number of kilobytes read.
+type: counter
+counted: true
+source: psutil
+unit: kilobytes
+rate: disk_io_rate
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- mount_point
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/system.io.kbs_w.yml b/site/data/v2metrics/system.io.kbs_w.yml
new file mode 100644
index 0000000000..2b8a0f164d
--- /dev/null
+++ b/site/data/v2metrics/system.io.kbs_w.yml
@@ -0,0 +1,30 @@
+
+---
+name: system.io.kbs_w
+categories:
+- system
+description: Number of kilobytes written.
+type: counter
+counted: true
+source: psutil
+unit: kilobytes
+rate: disk_io_rate
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- mount_point
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/system.io.wait_r.yml b/site/data/v2metrics/system.io.wait_r.yml
new file mode 100644
index 0000000000..015010eb1c
--- /dev/null
+++ b/site/data/v2metrics/system.io.wait_r.yml
@@ -0,0 +1,29 @@
+
+---
+name: system.io.wait_r
+categories:
+- system
+description: Time spent reading from disk.
+type: counter
+counted: true
+source: psutil
+unit: milliseconds
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- mount_point
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/system.io.wait_w.yml b/site/data/v2metrics/system.io.wait_w.yml
new file mode 100644
index 0000000000..0143cb8c03
--- /dev/null
+++ b/site/data/v2metrics/system.io.wait_w.yml
@@ -0,0 +1,29 @@
+
+---
+name: system.io.wait_w
+categories:
+- system
+description: Time spent writing to disk.
+type: counter
+counted: true
+source: psutil
+unit: milliseconds
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- mount_point
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/system.load.1.yml b/site/data/v2metrics/system.load.1.yml
new file mode 100644
index 0000000000..cbeb4cf056
--- /dev/null
+++ b/site/data/v2metrics/system.load.1.yml
@@ -0,0 +1,29 @@
+
+---
+name: system.load.1
+categories:
+- system
+description: Number of processes in the system run queue, averaged over the last 1
+  min.
+type: gauge
+counted: true
+source: psutil
+unit: float
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/system.load.15.yml b/site/data/v2metrics/system.load.15.yml
new file mode 100644
index 0000000000..34e85577e1
--- /dev/null
+++ b/site/data/v2metrics/system.load.15.yml
@@ -0,0 +1,29 @@
+
+---
+name: system.load.15
+categories:
+- system
+description: Number of processes in the system run queue, averaged over the last 15
+  min.
+type: gauge
+counted: true
+source: psutil
+unit: float
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/system.load.5.yml b/site/data/v2metrics/system.load.5.yml
new file mode 100644
index 0000000000..decaa23588
--- /dev/null
+++ b/site/data/v2metrics/system.load.5.yml
@@ -0,0 +1,29 @@
+
+---
+name: system.load.5
+categories:
+- system
+description: Number of processes in the system run queue, averaged over the last 5
+  min.
+type: gauge
+counted: true
+source: psutil
+unit: float
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/system.mem.available.yml b/site/data/v2metrics/system.mem.available.yml
new file mode 100644
index 0000000000..fab6690d45
--- /dev/null
+++ b/site/data/v2metrics/system.mem.available.yml
@@ -0,0 +1,28 @@
+
+---
+name: system.mem.available
+categories:
+- system
+description: Statistics about system memory usage.
+type: gauge
+counted: true
+source: psutil
+unit: bytes
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/system.mem.buffered.yml b/site/data/v2metrics/system.mem.buffered.yml
new file mode 100644
index 0000000000..b78024bb20
--- /dev/null
+++ b/site/data/v2metrics/system.mem.buffered.yml
@@ -0,0 +1,28 @@
+
+---
+name: system.mem.buffered
+categories:
+- system
+description: Statistics about system memory usage.
+type: gauge
+counted: true
+source: psutil
+unit: bytes
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/system.mem.cached.yml b/site/data/v2metrics/system.mem.cached.yml
new file mode 100644
index 0000000000..ecc98d132b
--- /dev/null
+++ b/site/data/v2metrics/system.mem.cached.yml
@@ -0,0 +1,28 @@
+
+---
+name: system.mem.cached
+categories:
+- system
+description: Statistics about system memory usage.
+type: gauge
+counted: true
+source: psutil
+unit: bytes
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/system.mem.free.yml b/site/data/v2metrics/system.mem.free.yml
new file mode 100644
index 0000000000..84f4335d06
--- /dev/null
+++ b/site/data/v2metrics/system.mem.free.yml
@@ -0,0 +1,28 @@
+
+---
+name: system.mem.free
+categories:
+- system
+description: Statistics about system memory usage.
+type: gauge
+counted: true
+source: psutil
+unit: bytes
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/system.mem.pct_used.yml b/site/data/v2metrics/system.mem.pct_used.yml
new file mode 100644
index 0000000000..d89817c855
--- /dev/null
+++ b/site/data/v2metrics/system.mem.pct_used.yml
@@ -0,0 +1,28 @@
+
+---
+name: system.mem.pct_used
+categories:
+- system
+description: Statistics about system memory usage, percentage.
+type: gauge
+counted: true
+source: psutil
+unit: percent
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/system.mem.shared.yml b/site/data/v2metrics/system.mem.shared.yml
new file mode 100644
index 0000000000..38bce1c366
--- /dev/null
+++ b/site/data/v2metrics/system.mem.shared.yml
@@ -0,0 +1,27 @@
+
+---
+name: system.mem.shared
+categories:
+- system
+description: Statistics about system memory usage.
+type: gauge
+source: psutil
+unit: bytes
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/system.mem.total.yml b/site/data/v2metrics/system.mem.total.yml
new file mode 100644
index 0000000000..ba9caf4673
--- /dev/null
+++ b/site/data/v2metrics/system.mem.total.yml
@@ -0,0 +1,28 @@
+
+---
+name: system.mem.total
+categories:
+- system
+description: Statistics about system memory usage.
+type: gauge
+counted: true
+source: psutil
+unit: bytes
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/system.mem.used.all.yml b/site/data/v2metrics/system.mem.used.all.yml
new file mode 100644
index 0000000000..41789a2ca3
--- /dev/null
+++ b/site/data/v2metrics/system.mem.used.all.yml
@@ -0,0 +1,28 @@
+
+---
+name: system.mem.used.all
+categories:
+- system
+description: Statistics about system memory usage.
+type: gauge
+counted: true
+source: psutil
+unit: bytes
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/system.mem.used.yml b/site/data/v2metrics/system.mem.used.yml
new file mode 100644
index 0000000000..ce6768c83f
--- /dev/null
+++ b/site/data/v2metrics/system.mem.used.yml
@@ -0,0 +1,28 @@
+
+---
+name: system.mem.used
+categories:
+- system
+description: Statistics about system memory usage.
+type: gauge
+counted: true
+source: psutil
+unit: bytes
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/system.net.bytes_rcvd.yml b/site/data/v2metrics/system.net.bytes_rcvd.yml
new file mode 100644
index 0000000000..c60183e11a
--- /dev/null
+++ b/site/data/v2metrics/system.net.bytes_rcvd.yml
@@ -0,0 +1,30 @@
+
+---
+name: system.net.bytes_rcvd
+categories:
+- system
+description: Network I/O statistics. Number of bytes received per network interface.
+type: counter
+counted: true
+source: psutil
+unit: bytes
+rate: net_io_rate
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- network_interface
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/system.net.bytes_sent.yml b/site/data/v2metrics/system.net.bytes_sent.yml
new file mode 100644
index 0000000000..e098f1cd8e
--- /dev/null
+++ b/site/data/v2metrics/system.net.bytes_sent.yml
@@ -0,0 +1,30 @@
+
+---
+name: system.net.bytes_sent
+categories:
+- system
+description: Network I/O statistics. Number of bytes sent per network interface.
+type: counter
+counted: true
+source: psutil
+unit: bytes
+rate: net_io_rate
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- network_interface
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/system.net.drops_in.count.yml b/site/data/v2metrics/system.net.drops_in.count.yml
new file mode 100644
index 0000000000..95aad9db70
--- /dev/null
+++ b/site/data/v2metrics/system.net.drops_in.count.yml
@@ -0,0 +1,31 @@
+
+---
+name: system.net.drops_in.count
+categories:
+- system
+description: Network I/O statistics. Total number of inbound packets dropped per network
+  interface.
+type: counter
+counted: true
+source: psutil
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- network_interface
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/system.net.drops_out.count.yml b/site/data/v2metrics/system.net.drops_out.count.yml
new file mode 100644
index 0000000000..a4593ba672
--- /dev/null
+++ b/site/data/v2metrics/system.net.drops_out.count.yml
@@ -0,0 +1,31 @@
+
+---
+name: system.net.drops_out.count
+categories:
+- system
+description: Network I/O statistics. Total number of outbound packets dropped per
+  network interface.
+type: counter
+counted: true
+source: psutil
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- network_interface
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/system.net.listen_overflows.yml b/site/data/v2metrics/system.net.listen_overflows.yml
new file mode 100644
index 0000000000..ead52a7724
--- /dev/null
+++ b/site/data/v2metrics/system.net.listen_overflows.yml
@@ -0,0 +1,29 @@
+
+---
+name: system.net.listen_overflows
+categories:
+- system
+description: Number of times the listen queue of a socket overflowed.
+type: counter
+counted: true
+source: psutil
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/system.net.packets_in.count.yml b/site/data/v2metrics/system.net.packets_in.count.yml
new file mode 100644
index 0000000000..502283731a
--- /dev/null
+++ b/site/data/v2metrics/system.net.packets_in.count.yml
@@ -0,0 +1,30 @@
+
+---
+name: system.net.packets_in.count
+categories:
+- system
+description: Network I/O statistics. Number of packets received per network interface.
+type: counter
+counted: true
+source: psutil
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- network_interface
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/system.net.packets_in.error.yml b/site/data/v2metrics/system.net.packets_in.error.yml
new file mode 100644
index 0000000000..c0e14b058c
--- /dev/null
+++ b/site/data/v2metrics/system.net.packets_in.error.yml
@@ -0,0 +1,31 @@
+
+---
+name: system.net.packets_in.error
+categories:
+- system
+description: Network I/O statistics. Total number of errors while receiving per network
+  interface.
+type: counter
+counted: true
+source: psutil
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- network_interface
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/system.net.packets_out.count.yml b/site/data/v2metrics/system.net.packets_out.count.yml
new file mode 100644
index 0000000000..1a6e444616
--- /dev/null
+++ b/site/data/v2metrics/system.net.packets_out.count.yml
@@ -0,0 +1,30 @@
+
+---
+name: system.net.packets_out.count
+categories:
+- system
+description: Network I/O statistics. Number of packets sent per network interface.
+type: counter
+counted: true
+source: psutil
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- network_interface
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/system.net.packets_out.error.yml b/site/data/v2metrics/system.net.packets_out.error.yml
new file mode 100644
index 0000000000..7f43425768
--- /dev/null
+++ b/site/data/v2metrics/system.net.packets_out.error.yml
@@ -0,0 +1,31 @@
+
+---
+name: system.net.packets_out.error
+categories:
+- system
+description: Network I/O statistics. Total number of errors while sending per network
+  interface.
+type: counter
+counted: true
+source: psutil
+unit: integer
+rate: double
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- network_interface
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/system.swap.free.yml b/site/data/v2metrics/system.swap.free.yml
new file mode 100644
index 0000000000..8b6f99c892
--- /dev/null
+++ b/site/data/v2metrics/system.swap.free.yml
@@ -0,0 +1,28 @@
+
+---
+name: system.swap.free
+categories:
+- system
+description: System swap memory statistics.
+type: gauge
+counted: true
+source: psutil
+unit: bytes
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/system.swap.pct_free.yml b/site/data/v2metrics/system.swap.pct_free.yml
new file mode 100644
index 0000000000..7211c1e66e
--- /dev/null
+++ b/site/data/v2metrics/system.swap.pct_free.yml
@@ -0,0 +1,28 @@
+
+---
+name: system.swap.pct_free
+categories:
+- system
+description: System swap memory statistics, percentage.
+type: gauge
+counted: true
+source: psutil
+unit: percent
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/system.swap.total.yml b/site/data/v2metrics/system.swap.total.yml
new file mode 100644
index 0000000000..64da689236
--- /dev/null
+++ b/site/data/v2metrics/system.swap.total.yml
@@ -0,0 +1,28 @@
+
+---
+name: system.swap.total
+categories:
+- system
+description: System swap memory statistics.
+type: gauge
+counted: true
+source: psutil
+unit: bytes
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/system.swap.used.yml b/site/data/v2metrics/system.swap.used.yml
new file mode 100644
index 0000000000..ca87fd6e72
--- /dev/null
+++ b/site/data/v2metrics/system.swap.used.yml
@@ -0,0 +1,28 @@
+
+---
+name: system.swap.used
+categories:
+- system
+description: System swap memory statistics.
+type: gauge
+counted: true
+source: psutil
+unit: bytes
+visible: true
+compound_payload: "false"
+modules:
+- platform
+aggregations:
+- MIN
+- MAX
+- SUM
+- AVG
+- COUNT
+- RATE
+dimensions:
+- system_id
+- hostname
+- display_name
+- nginx_id
+- instance_group
+- system.tags
diff --git a/site/data/v2metrics/upstream.header.latency.max.yml b/site/data/v2metrics/upstream.header.latency.max.yml
new file mode 100644
index 0000000000..9936dac6a2
--- /dev/null
+++ b/site/data/v2metrics/upstream.header.latency.max.yml
@@ -0,0 +1,57 @@
+
+---
+name: upstream.header.latency.max
+categories:
+  - advanced-metrics
+description:
+  Maximal header latency observed on a given upstream. 
+  If `family` dimension is set to `web`, the request was `http` type
+  and if the `family` is set to `tcp-udp`, the request was `stream` type.
+type: gauge
+source: advanced-metrics-module
+unit: milliseconds
+rate: ""
+visible: true
+compound_payload: "false"
+modules:
+  - adm
+  - acm
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - app
+  - environment
+  - component
+  - gateway
+  - http.hostname
+  - http.request_method
+  - http.response_code
+  - http.upstream_addr
+  - http.uri
+  - http.version_schema
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - instance_group
+  - system.tags
+  - acm_api_proxy_hostname
+  - acm_api_proxy_name
+  - acm_api_proxy_version
+  - acm_environments_name
+  - acm_environments_type
+  - acm_infra_workspaces_name
+  - acm_service_workspaces_name
+  - family
+  - proxied_protocol
+  - site
+  - environment_name
+  - gateway_name
+  - component_name
+  - app_name
+  - site_name
diff --git a/site/data/v2metrics/upstream.network.latency.max.yml b/site/data/v2metrics/upstream.network.latency.max.yml
new file mode 100644
index 0000000000..3ddb213268
--- /dev/null
+++ b/site/data/v2metrics/upstream.network.latency.max.yml
@@ -0,0 +1,57 @@
+
+---
+name: upstream.network.latency.max
+categories:
+  - advanced-metrics
+description:
+  Maximal network latency observed on a given upstream. 
+  If `family` dimension is set to `web`, the request was `http` type
+  and if the `family` is set to `tcp-udp`, the request was `stream` type.
+type: gauge
+source: advanced-metrics-module
+unit: milliseconds
+rate: ""
+visible: true
+compound_payload: "false"
+modules:
+  - adm
+  - acm
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - app
+  - environment
+  - component
+  - gateway
+  - http.hostname
+  - http.request_method
+  - http.response_code
+  - http.upstream_addr
+  - http.uri
+  - http.version_schema
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - instance_group
+  - system.tags
+  - acm_api_proxy_hostname
+  - acm_api_proxy_name
+  - acm_api_proxy_version
+  - acm_environments_name
+  - acm_environments_type
+  - acm_infra_workspaces_name
+  - acm_service_workspaces_name
+  - family
+  - proxied_protocol
+  - site
+  - environment_name
+  - gateway_name
+  - component_name
+  - app_name
+  - site_name
diff --git a/site/data/v2metrics/upstream.response.latency.max.yml b/site/data/v2metrics/upstream.response.latency.max.yml
new file mode 100644
index 0000000000..4bf5dd596c
--- /dev/null
+++ b/site/data/v2metrics/upstream.response.latency.max.yml
@@ -0,0 +1,57 @@
+
+---
+name: upstream.response.latency.max
+categories:
+  - advanced-metrics
+description:
+  Maximal response latency observed on a given upstream. 
+  If `family` dimension is set to `web`, the request was `http` type
+  and if the `family` is set to `tcp-udp`, the request was `stream` type.
+type: gauge
+source: advanced-metrics-module
+unit: milliseconds
+rate: ""
+visible: true
+compound_payload: "false"
+modules:
+  - adm
+  - acm
+aggregations:
+  - MIN
+  - MAX
+  - SUM
+  - AVG
+  - COUNT
+  - RATE
+dimensions:
+  - app
+  - environment
+  - component
+  - gateway
+  - http.hostname
+  - http.request_method
+  - http.response_code
+  - http.upstream_addr
+  - http.uri
+  - http.version_schema
+  - system_id
+  - hostname
+  - display_name
+  - nginx_id
+  - instance_group
+  - system.tags
+  - acm_api_proxy_hostname
+  - acm_api_proxy_name
+  - acm_api_proxy_version
+  - acm_environments_name
+  - acm_environments_type
+  - acm_infra_workspaces_name
+  - acm_service_workspaces_name
+  - family
+  - proxied_protocol
+  - site
+  - environment_name
+  - gateway_name
+  - component_name
+  - app_name
+  - site_name
diff --git a/site/layouts/catalogs/single.html b/site/layouts/catalogs/single.html
new file mode 100644
index 0000000000..57b1d77790
--- /dev/null
+++ b/site/layouts/catalogs/single.html
@@ -0,0 +1,14 @@
+{{ define "main" }}
+<div class="row flex-xl-nowrap">
+  <nav class="sidenav overflow-auto col-md-3 d-none d-xl-block d-print-none align-top">
+    {{ partial "sidebar.html" . }}
+  </nav>
+  
+    {{ .Content }}
+
+{{if .Params.script}}
+  {{ $script := (delimit (slice "scripts" .Params.script) "/")}}
+  {{ partial (string $script) .}}
+{{end }}
+
+{{ end }}
diff --git a/site/layouts/shortcodes/v2-metrics.html b/site/layouts/shortcodes/v2-metrics.html
new file mode 100644
index 0000000000..dc14d9a35e
--- /dev/null
+++ b/site/layouts/shortcodes/v2-metrics.html
@@ -0,0 +1,56 @@
+<main class="content col-xl-6 d-block align-top" role="main">
+    {{ range .Site.Data.v2metrics }}
+    <a name="{{.name}}"></a>
+    <h2 id={{.name}}>{{.name}}
+        <a class="headerlink float-right" href="#{{.name}}" title="{{.name}}"><i class="fas fa-link fa-xs"
+            aria-hidden="true"></i></a>
+      </h2>
+      <table>
+        <tbody>
+          <tr>
+            <td style="width: 200px; padding-bottom:5px">description</td>
+            <td>{{.description}}</td>
+          </tr>
+          <tr>
+            <td style="width: 200px; padding-bottom:5px">type</td>
+            <td>{{.type}}</td>
+          </tr>
+          <tr>
+            <td style="width: 200px; padding-bottom:5px">categories</td>
+            <td>{{.categories}}</td>
+          </tr>
+          <tr>
+            <td style="width: 200px; padding-bottom:5px">source</td>
+            <td>{{.source}}</td>
+          </tr>
+          <tr>
+            <td style="width: 200px; padding-bottom:5px">rollup_aggregate</td>
+            <td>{{.rollup_aggregate}}</td>
+          </tr>
+          <tr>
+            <td style="width: 200px; padding-bottom:5px">unit</td>
+            <td>{{.unit}}</td>
+          </tr>
+          <tr>
+            <td style="width: 200px; padding-bottom:5px">aggregations</td>
+            <td>
+              {{ range .aggregations }}
+              {{ . }};
+              {{end}}
+            </td>
+          </tr>
+          <tr>
+            <td style="width: 200px; padding-bottom:5px">dimensions</td>
+            <td>
+              {{ range sort .dimensions }}
+              <li>
+                {{ . }}
+              </li>
+              {{end}}
+            </td>
+          </tr>
+        </tbody>
+      </table>
+      <hr>
+      {{ end }}
+    </main>
\ No newline at end of file