From 48b05e252e199bf025c1aa7ee7cd7b01cc7a100d Mon Sep 17 00:00:00 2001
From: nathan haugo <nhaugo@gmail.com>
Date: Fri, 11 Nov 2016 12:40:19 -0800
Subject: [PATCH 1/3] Cleanup and aggregates of templates
---
canned/apache.json | 12 ++++++------
canned/kubernetes_node.json | 12 ++++++------
canned/kubernetes_pod_container.json | 12 ++++++------
canned/kubernetes_pod_network.json | 12 ++++++------
canned/kubernetes_system_container.json | 12 ++++++------
canned/load.json | 4 ++--
canned/mem.json | 6 +++---
canned/netstat.json | 20 +++++++++----------
canned/nginx.json | 24 +++++++++++++----------
canned/nsq_channel.json | 12 ++++++------
canned/nsq_server.json | 12 ++++++------
canned/nsq_topic.json | 18 ++++++++---------
canned/postgresql.json | 26 ++++++++++++-------------
canned/processes.json | 6 +++---
canned/redis.json | 16 +++++++--------
canned/win_cpu.json | 6 +++---
canned/win_mem.json | 6 +++---
canned/win_net.json | 12 ++++++------
canned/win_system.json | 6 +++---
canned/win_websvc.json | 14 ++++++-------
20 files changed, 125 insertions(+), 123 deletions(-)
diff --git a/canned/apache.json b/canned/apache.json
index 54f1bf2da9..2638cd53db 100644
--- a/canned/apache.json
+++ b/canned/apache.json
@@ -9,10 +9,10 @@
"w": 4,
"h": 4,
"i": "0246e457-916b-43e3-be99-211c4cbc03e8",
- "name": "Apache bytes/s",
+ "name": "Apache Bytes/Second",
"queries": [
{
- "query": "select mean(\"BytesPerSec\") AS \"bytes_per_sec\" from apache",
+ "query": "SELECT mean(\"BytesPerSec\") AS \"bytes_per_sec\" FROM apache",
"db": "telegraf",
"rp": "",
"groupbys": [
@@ -28,10 +28,10 @@
"w": 4,
"h": 4,
"i": "37f2e4bb-9fa5-4891-a424-9df5ce7458bb",
- "name": "Apache requests/s",
+ "name": "Apache - Requests/Second",
"queries": [
{
- "query": "select mean(\"ReqPerSec\") as req_per_sec from apache",
+ "query": "SELECT mean(\"ReqPerSec\") AS \"req_per_sec\" FROM apache",
"db": "telegraf",
"rp": "",
"groupbys": [
@@ -47,10 +47,10 @@
"w": 4,
"h": 4,
"i": "ea9174b3-2b56-4e80-a37d-064507c6775a",
- "name": "Apache total accesses",
+ "name": "Apache - Total Accesses",
"queries": [
{
- "query": "select mean(\"TotalAccesses\") as tot_access from apache",
+ "query": "SELECT mean(\"TotalAccesses\") AS \"tot_access\" FROM apache",
"db": "telegraf",
"rp": "",
"groupbys": [
diff --git a/canned/kubernetes_node.json b/canned/kubernetes_node.json
index 9be96989eb..f1e76c6267 100644
--- a/canned/kubernetes_node.json
+++ b/canned/kubernetes_node.json
@@ -9,12 +9,12 @@
"w": 4,
"h": 4,
"i": "5f406919-14b8-4c01-b0ce-f8ed75310805",
- "name": "K8s node millicores",
+ "name": "K8s - Node Millicores",
"queries": [
{
- "query": "select \"cpu_usage_nanocores\" / 1000000 as cpu_usage_millicores from kubernetes_node",
+ "query": "SELECT mean(\"cpu_usage_nanocores\") / 1000000 AS \"cpu_usage_millicores\" FROM kubernetes_node",
"db": "telegraf",
- "rp": "autogen",
+ "rp": "",
"groupbys": [
"\"node_name\""
],
@@ -28,12 +28,12 @@
"w": 4,
"h": 4,
"i": "042d47cc-fcfd-4b26-a690-d81c0321d408",
- "name": "K8s node memory bytes",
+ "name": "K8s - Node Memory Bytes",
"queries": [
{
- "query": "select \"memory_usage_bytes\" from kubernetes_node",
+ "query": "SELECT mean(\"memory_usage_bytes\") AS \"memory_usage_bytes\" FROM kubernetes_node",
"db": "telegraf",
- "rp": "autogen",
+ "rp": "",
"groupbys": [
"\"node_name\""
],
diff --git a/canned/kubernetes_pod_container.json b/canned/kubernetes_pod_container.json
index 82f74ce902..d51124e22e 100644
--- a/canned/kubernetes_pod_container.json
+++ b/canned/kubernetes_pod_container.json
@@ -9,12 +9,12 @@
"w": 4,
"h": 4,
"i": "e2427235-c81b-42a1-afdf-80d340fc01f8",
- "name": "K8s pod millicores",
+ "name": "K8s - Pod Millicores",
"queries": [
{
- "query": "select \"cpu_usage_nanocores\" / 1000000 as cpu_usage_millicores from kubernetes_pod_container",
+ "query": "SELECT mean(\"cpu_usage_nanocores\") / 1000000 AS \"cpu_usage_millicores\" FROM kubernetes_pod_container",
"db": "telegraf",
- "rp": "autogen",
+ "rp": "",
"groupbys": [
"\"pod_name\""
],
@@ -28,12 +28,12 @@
"w": 4,
"h": 4,
"i": "6edb8c61-f723-47ce-a7eb-904fc6fe066e",
- "name": "K8s pod memory bytes",
+ "name": "K8s - Pod Memory Bytes",
"queries": [
{
- "query": "select \"memory_usage_bytes\" from kubernetes_pod_container",
+ "query": "SELECT mean(\"memory_usage_bytes\") AS \"memory_usage_bytes\" FROM kubernetes_pod_container",
"db": "telegraf",
- "rp": "autogen",
+ "rp": "",
"groupbys": [
"\"pod_name\""
],
diff --git a/canned/kubernetes_pod_network.json b/canned/kubernetes_pod_network.json
index b10c226ba8..c7643489fc 100644
--- a/canned/kubernetes_pod_network.json
+++ b/canned/kubernetes_pod_network.json
@@ -9,12 +9,12 @@
"w": 4,
"h": 4,
"i": "0e06ddcd-05dd-493f-9dba-a382300a7190",
- "name": "K8s pod TX bytes/second",
+ "name": "K8s - Pod TX Bytes/Second",
"queries": [
{
- "query": "select non_negative_derivative(\"tx_bytes\") as tx_bytes_per_second from kubernetes_pod_network",
+ "query": "SELECT non_negative_derivative(\"tx_bytes\") AS \"tx_bytes_per_second\" FROM kubernetes_pod_network",
"db": "telegraf",
- "rp": "autogen",
+ "rp": "",
"groupbys": [
"\"pod_name\"",
"\"host\""
@@ -29,12 +29,12 @@
"w": 4,
"h": 4,
"i": "cc062b4c-70ca-4bd7-b372-398e734feb49",
- "name": "K8s pod RX bytes/second ",
+ "name": "K8s - Pod RX Bytes/Second ",
"queries": [
{
- "query": "select non_negative_derivative(\"rx_bytes\") as rx_bytes_per_second from kubernetes_pod_network",
+ "query": "SELECT non_negative_derivative(\"rx_bytes\") AS \"rx_bytes_per_second\" fROM kubernetes_pod_network",
"db": "telegraf",
- "rp": "autogen",
+ "rp": "",
"groupbys": [
"\"pod_name\"",
"\"host\""
diff --git a/canned/kubernetes_system_container.json b/canned/kubernetes_system_container.json
index bea864e78f..27d45a12e8 100644
--- a/canned/kubernetes_system_container.json
+++ b/canned/kubernetes_system_container.json
@@ -9,12 +9,12 @@
"w": 4,
"h": 4,
"i": "64cf0f60-e157-4c03-9d7e-c280a7e2695f",
- "name": "K8s Kubelet millicores",
+ "name": "K8s - Kubelet Millicores",
"queries": [
{
- "query": "select \"cpu_usage_nanocores\" / 1000000 as cpu_usage_millicores from kubernetes_system_container",
+ "query": "SELECT mean(\"cpu_usage_nanocores\"\) / 1000000 AS \"cpu_usage_millicores\" FROM kubernetes_system_container",
"db": "telegraf",
- "rp": "autogen",
+ "rp": "",
"groupbys": [],
"wheres": [
"\"container_name\" = 'kubelet'"
@@ -28,12 +28,12 @@
"w": 4,
"h": 4,
"i": "4a7454d1-4d60-4077-9e7b-8c915a00fe66",
- "name": "K8s Kubelet memory bytes",
+ "name": "K8s - Kubelet Memory Bytes",
"queries": [
{
- "query": "select \"memory_usage_bytes\" from kubernetes_system_container",
+ "query": "select mean(\"memory_usage_bytes\") AS \"memory_usage_bytes\" FROM kubernetes_system_container",
"db": "telegraf",
- "rp": "autogen",
+ "rp": "",
"groupbys": [],
"wheres": [
"\"container_name\" = 'kubelet'"
diff --git a/canned/load.json b/canned/load.json
index 9fc439bc1e..c32c6a6d3a 100644
--- a/canned/load.json
+++ b/canned/load.json
@@ -12,9 +12,9 @@
"name": "System Load",
"queries": [
{
- "query": "SELECT mean(\"load1\") FROM \"telegraf\"..\"system\"",
+ "query": "SELECT mean(\"load1\") AS \"load" FROM \"telegraf\"..\"system\"",
"db": "telegraf",
- "rp": "autogen",
+ "rp": "",
"groupbys": [],
"wheres": []
}
diff --git a/canned/mem.json b/canned/mem.json
index 03411d89de..12db4943c9 100644
--- a/canned/mem.json
+++ b/canned/mem.json
@@ -9,12 +9,12 @@
"w": 4,
"h": 4,
"i": "e6e5063c-43d5-409b-a0ab-68da51ed3f28",
- "name": "Memory bytes used",
+ "name": "System - Memory Bytes Used",
"queries": [
{
- "query": "SELECT mean(\"used\"), mean(\"available\") FROM \"telegraf\"..\"mem\"",
+ "query": "SELECT mean(\"used\") AS \"used\", mean(\"available\") AS \"available\" FROM \"telegraf\"..\"mem\"",
"db": "telegraf",
- "rp": "autogen",
+ "rp": "",
"groupbys": [],
"wheres": []
}
diff --git a/canned/netstat.json b/canned/netstat.json
index d37024a83b..2d7092b5f2 100644
--- a/canned/netstat.json
+++ b/canned/netstat.json
@@ -9,19 +9,19 @@
"w": 4,
"h": 4,
"i": "cf5d0608-b513-4244-a55f-accf520da3a1",
- "name": "Open sockets",
+ "name": "System - Open Sockets",
"queries": [
{
- "query": "select tcp_established from netstat",
+ "query": "SELECT mean(\"tcp_established\") AS \"tcp_established\" FROM netstat",
"db": "telegraf",
- "rp": "autogen",
+ "rp": "",
"groupbys": [],
"wheres": []
},
{
- "query": "select udp_socket from netstat",
+ "query": "SELECT mean(\"udp_socket\") AS \"udp_socket\" FROM netstat",
"db": "telegraf",
- "rp": "autogen",
+ "rp": "",
"groupbys": [],
"wheres": []
}
@@ -33,19 +33,19 @@
"w": 4,
"h": 4,
"i": "63503235-a588-49a7-ae0a-fb015c888e5b",
- "name": "Sockets created/second ",
+ "name": "System - Sockets Created/Second ",
"queries": [
{
- "query": "select derivative(\"tcp_established\") from netstat",
+ "query": "SELECT derivative(\"tcp_established\") AS \"tcp_established\" FROM netstat",
"db": "telegraf",
- "rp": "autogen",
+ "rp": "",
"groupbys": [],
"wheres": []
},
{
- "query": "select derivative(\"udp_socket\") from netstat",
+ "query": "SELECT derivative(\"udp_socket\") AS \"udp_socket\" FROM netstat",
"db": "telegraf",
- "rp": "autogen",
+ "rp": "",
"groupbys": [],
"wheres": []
}
diff --git a/canned/nginx.json b/canned/nginx.json
index dbd2e97d02..cb6eff52d4 100644
--- a/canned/nginx.json
+++ b/canned/nginx.json
@@ -9,14 +9,17 @@
"w": 4,
"h": 4,
"i": "a209be7f-33c6-4612-88b2-848ae402c66a",
- "name": "NGINX – Client connections",
+ "name": "NGINX – Client Connections",
"queries": [
{
+<<<<<<< 521c294017a685ca2118a74bd4942829ad04f30f
"query": "select non_negative_derivative(max(\"accepts\"), 1s) as \"accepts\", non_negative_derivative(max(\"handled\"), 1s) as \"handled\", non_negative_derivative(max(\"active\"), 1s) as \"active\" from nginx",
+=======
+ "query": "SELECT mean(\"accepts\") AS \"accepts\", mean(\"handled\") AS \"handled\", mean(\"active\") AS \"active\" FROM nginx",
+>>>>>>> Cleanup and aggregates of templates
"db": "telegraf",
"rp": "",
"groupbys": [
- "time(10s)",
"\"server\""
],
"wheres": []
@@ -29,14 +32,17 @@
"w": 4,
"h": 4,
"i": "0fc591ad-8541-4de3-a36e-4ae69ff954c4",
- "name": "NGINX – Client errors",
+ "name": "NGINX – Client Errors",
"queries": [
{
+<<<<<<< 521c294017a685ca2118a74bd4942829ad04f30f
"query": "select non_negative_derivative(max(\"accepts\")) - non_negative_derivative(max(\"handled\")) from nginx",
+=======
+ "query": "SELECT mean(\"accepts\") - mean(\"handled\") AS \"dropped\" FROM nginx",
+>>>>>>> Cleanup and aggregates of templates
"db": "telegraf",
"rp": "",
"groupbys": [
- "time(10s)",
"\"server\""
],
"wheres": []
@@ -49,14 +55,13 @@
"w": 4,
"h": 4,
"i": "a1f37574-b86e-4278-8acc-ba78d3ac2e4e",
- "name": "NGINX – Client requests",
+ "name": "NGINX – Client Requests",
"queries": [
{
- "query": "select non_negative_derivative(max(\"requests\"), 1s) as \"requests\" from nginx",
+ "query": "SELECT non_negative_derivative(max(\"requests\"), 1s) AS \"requests\" FROM nginx",
"db": "telegraf",
"rp": "",
"groupbys": [
- "time(10s)",
"\"server\""
],
"wheres": []
@@ -69,14 +74,13 @@
"w": 4,
"h": 4,
"i": "5b91c5b0-d270-4d03-aeae-007f2351c80c",
- "name": "NGINX – Active Client state",
+ "name": "NGINX – Active Client State",
"queries": [
{
- "query": "select non_negative_derivative(max(\"waiting\"), 1s) as \"waiting\", non_negative_derivative(max(\"reading\"), 1s) as \"reading\", non_negative_derivative(max(\"writing\"), 1s) as \"writing\" from nginx",
+ "query": "SELECT non_negative_derivative(max(\"waiting\"), 1s) AS \"waiting\", non_negative_derivative(max(\"reading\"), 1s) AS \"reading\", non_negative_derivative(max(\"writing\"), 1s) AS \"writing\" FROM nginx",
"db": "telegraf",
"rp": "",
"groupbys": [
- "time(10s)",
"\"server\""
],
"wheres": []
diff --git a/canned/nsq_channel.json b/canned/nsq_channel.json
index 787c74964e..8c9f848d85 100644
--- a/canned/nsq_channel.json
+++ b/canned/nsq_channel.json
@@ -9,12 +9,12 @@
"w": 4,
"h": 4,
"i": "89dad9c8-3391-400e-a44a-b5d4a2c53bf1",
- "name": "NSQ channel client count",
+ "name": "NSQ - Channel Client Count",
"queries": [
{
- "query": "select client_count from nsq_channel",
+ "query": "SELECT mean(\"client_count\") AS \"client_count\" FROM nsq_channel",
"db": "telegraf",
- "rp": "autogen",
+ "rp": "",
"groupbys": [
"\"topic\"",
"\"channel\""
@@ -29,12 +29,12 @@
"w": 4,
"h": 4,
"i": "e3eb48c0-8283-4445-b174-f4f8e4182e45",
- "name": "NSQ channel messages count",
+ "name": "NSQ - Channel Messages Count",
"queries": [
{
- "query": "select message_count from nsq_channel",
+ "query": "SELECT mean(\"message_count\") AS \"message_count\" FROM nsq_channel",
"db": "telegraf",
- "rp": "autogen",
+ "rp": "",
"groupbys": [
"\"topic\"",
"\"channel\""
diff --git a/canned/nsq_server.json b/canned/nsq_server.json
index 58154e28d4..2b64a114d5 100644
--- a/canned/nsq_server.json
+++ b/canned/nsq_server.json
@@ -9,12 +9,12 @@
"w": 4,
"h": 4,
"i": "c376a3d8-cd2a-4212-bf1d-da776b75feeb",
- "name": "NSQ topic count",
+ "name": "NSQ - Topic Count",
"queries": [
{
- "query": "select topic_count from nsq_server",
+ "query": "SELECT mean(\"topic_count\") AS \"topic_count\" FROM nsq_server",
"db": "telegraf",
- "rp": "autogen",
+ "rp": "",
"groupbys": [],
"wheres": []
}
@@ -26,12 +26,12 @@
"w": 4,
"h": 4,
"i": "aa1aa20a-48aa-4a42-aaa0-426aa6a58aa8",
- "name": "NSQ server count",
+ "name": "NSQ - Server Count",
"queries": [
{
- "query": "select server_count from nsq_server",
+ "query": "SELECT mean(\"server_count\") AS \"server_count\" FROM nsq_server",
"db": "telegraf",
- "rp": "autogen",
+ "rp": "",
"groupbys": [],
"wheres": []
}
diff --git a/canned/nsq_topic.json b/canned/nsq_topic.json
index 6797386222..66c45828ea 100644
--- a/canned/nsq_topic.json
+++ b/canned/nsq_topic.json
@@ -9,12 +9,12 @@
"w": 4,
"h": 4,
"i": "f07967cb-2c2a-41cb-8420-f041f46b0635",
- "name": "NSQ topic messages",
+ "name": "NSQ - Topic Messages",
"queries": [
{
- "query": "select depth from nsq_topic",
+ "query": "SELECT mean(\"depth\") AS \"depth\" FROM nsq_topic",
"db": "telegraf",
- "rp": "autogen",
+ "rp": "",
"groupbys": [
"\"topic\""
],
@@ -28,12 +28,12 @@
"w": 4,
"h": 4,
"i": "912f337b-3af2-42af-9352-b31a5bc3b431",
- "name": "NSQ topic messages on disk",
+ "name": "NSQ - Topic Messages on Disk",
"queries": [
{
- "query": "select backend_depth from nsq_topic",
+ "query": "SELECT mean(\"backend_depth\") AS \"backend_depth\" FROM nsq_topic",
"db": "telegraf",
- "rp": "autogen",
+ "rp": "",
"groupbys": [
"\"topic\""
],
@@ -47,12 +47,12 @@
"w": 4,
"h": 4,
"i": "06909f21-f035-4668-8193-8e06a018accb",
- "name": "NSQ topic ingress",
+ "name": "NSQ - Topic Ingress",
"queries": [
{
- "query": "select derivative(\"message_count\") as messages_per_second from nsq_topic",
+ "query": "select derivative(\"message_count\") AS \"messages_per_second\" FROM nsq_topic",
"db": "telegraf",
- "rp": "autogen",
+ "rp": "",
"groupbys": [
"\"topic\"",
"\"host\""
diff --git a/canned/postgresql.json b/canned/postgresql.json
index 85ba4ab86b..ef0b1b3d47 100644
--- a/canned/postgresql.json
+++ b/canned/postgresql.json
@@ -9,12 +9,12 @@
"w": 12,
"h": 4,
"i": "b417bc9f-b16d-4691-91a7-85adfdd3e8ec",
- "name": "PostgreSQL Rows",
+ "name": "PostgreSQL - Rows",
"queries": [
{
- "query": "select non_negative_derivative(tup_fetched) as fetched, non_negative_derivative(tup_returned) as returned, non_negative_derivative(tup_inserted) as inserted, non_negative_derivative(tup_updated) as updated from postgresql",
+ "query": "SELECT non_negative_derivative(\"tup_fetched\") AS \"fetched\", non_negative_derivative(\"tup_returned\") AS \"returned\", non_negative_derivative(\"tup_inserted\") AS \"inserted\", non_negative_derivative(\"tup_updated\") AS \"updated\" FROM postgresql",
"db": "telegraf",
- "rp": "autogen",
+ "rp": "",
"groupbys": [
"db"
],
@@ -28,12 +28,12 @@
"w": 12,
"h": 4,
"i": "230d5baa-9376-438c-9a55-6f97f8c68e69",
- "name": "PostgreSQL QPS",
+ "name": "PostgreSQL - QPS",
"queries": [
{
- "query": "select non_negative_derivative(xact_commit) as xact_commit from postgresql",
+ "query": "SELECT non_negative_derivative(\"xact_commit\") AS \"xact_commit\" FROM postgresql",
"db": "telegraf",
- "rp": "autogen",
+ "rp": "",
"groupbys": [
"db"
],
@@ -47,14 +47,13 @@
"w": 6,
"h": 4,
"i": "4762130d-7005-467f-80ad-8c7f6dfe822e",
- "name": "PostgreSQL Buffers",
+ "name": "PostgreSQL - Buffers",
"queries": [
{
- "query": "select mean(buffers_alloc) as buffers_allocated, mean(buffers_backend) as buffers_backend, mean(buffers_backend_fsync) as buffers_backend_fsync, mean(buffers_checkpoint) as buffers_checkpoint, mean(buffers_clean) as buffers_clean from postgresql",
+ "query": "SELECT mean(\"buffers_alloc\") AS \"buffers_allocated\", mean(\"buffers_backend\") AS \"buffers_backend\", mean(\"buffers_backend_fsync\") AS \"buffers_backend_fsync\", mean(\"buffers_checkpoint\") AS \"buffers_checkpoint\", mean(\"buffers_clean\") AS \"buffers_clean\" FROM postgresql",
"db": "telegraf",
- "rp": "autogen",
+ "rp": "",
"groupbys": [
- "time(1m)"
],
"wheres": []
}
@@ -66,14 +65,13 @@
"w": 6,
"h": 4,
"i": "95e73bda-7527-4aca-89dd-109cb6bb4294",
- "name": "PostgreSQL Conflicts/Deadlocks",
+ "name": "PostgreSQL - Conflicts/Deadlocks",
"queries": [
{
- "query": "select mean(conflicts) as conflicts, mean(deadlocks) as deadlocks from postgresql",
+ "query": "SELECT mean(\"conflicts\") AS \"conflicts\", mean(\"deadlocks\") AS \"deadlocks\" FROM postgresql",
"db": "telegraf",
- "rp": "autogen",
+ "rp": "",
"groupbys": [
- "time(1m)"
],
"wheres": []
}
diff --git a/canned/processes.json b/canned/processes.json
index b236b6fde5..e430b43a5b 100644
--- a/canned/processes.json
+++ b/canned/processes.json
@@ -9,12 +9,12 @@
"w": 4,
"h": 4,
"i": "84048146-f93d-4d6c-b7dd-c8e2a68abb27",
- "name": "Total Processes",
+ "name": "System - Total Processes",
"queries": [
{
- "query": "select total from processes",
+ "query": "SELECT mean(\"total\") AS \"total\" FROM processes",
"db": "telegraf",
- "rp": "autogen",
+ "rp": "",
"groupbys": [],
"wheres": []
}
diff --git a/canned/redis.json b/canned/redis.json
index 1fa2e85d31..6edc5a8cf0 100644
--- a/canned/redis.json
+++ b/canned/redis.json
@@ -12,9 +12,9 @@
"name": "Redis - Connected Clients",
"queries": [
{
- "query": "select clients from redis",
+ "query": "SELECT mean(\"clients\") AS \"clients\" FROM redis",
"db": "telegraf",
- "rp": "autogen",
+ "rp": "",
"groupbys": []
}
]
@@ -28,9 +28,9 @@
"name": "Redis - Blocked Clients",
"queries": [
{
- "query": "select blocked_clients from redis",
+ "query": "SELECT mean(\"blocked_clients\") AS \"blocked_clients\" FROM redis",
"db": "telegraf",
- "rp": "autogen",
+ "rp": "",
"groupbys": []
}
]
@@ -44,9 +44,9 @@
"name": "Redis - CPU",
"queries": [
{
- "query": "select non_negative_derivative(\"used_cpu_user\") as used_cpu_per_second from redis",
+ "query": "SELECT non_negative_derivative(\"used_cpu_user\") AS \"used_cpu_per_second\" FROM redis",
"db": "telegraf",
- "rp": "autogen",
+ "rp": "",
"groupbys": []
}
]
@@ -60,9 +60,9 @@
"name": "Redis - Memory",
"queries": [
{
- "query": "select non_negative_derivative(\"used_memory\") as used_memory_per_second from redis",
+ "query": "SELECT non_negative_derivative(\"used_memory\") AS \"used_memory_per_second\" FROM redis",
"db": "telegraf",
- "rp": "autogen",
+ "rp": "",
"groupbys": []
}
]
diff --git a/canned/win_cpu.json b/canned/win_cpu.json
index ec1e23be71..1773fe7462 100644
--- a/canned/win_cpu.json
+++ b/canned/win_cpu.json
@@ -9,12 +9,12 @@
"w": 4,
"h": 4,
"i": "6921e19a-951e-42ef-b304-2b8b661fcc81",
- "name": "CPU Usage",
+ "name": "System - CPU Usage",
"queries": [
{
- "query": "select Percent_Processor_Time from win_cpu",
+ "query": "SELECT mean(\"Percent_Processor_Time\") AS \"percent_processor_time\" FROM win_cpu",
"db": "telegraf",
- "rp": "autogen",
+ "rp": "",
"groupbys": [],
"wheres": []
}
diff --git a/canned/win_mem.json b/canned/win_mem.json
index c18318c81a..e4c8017b78 100644
--- a/canned/win_mem.json
+++ b/canned/win_mem.json
@@ -9,12 +9,12 @@
"w": 4,
"h": 4,
"i": "1c275ca5-84a7-4146-9cf0-8ed654abb627",
- "name": "Available bytes",
+ "name": "System - Available Bytes",
"queries": [
{
- "query": "select Available_Bytes from win_mem",
+ "query": "SELECT mean(\"Available_Bytes\") AS \"available_bytes\" FROM win_mem",
"db": "telegraf",
- "rp": "autogen",
+ "rp": "",
"groupbys": [],
"wheres": []
}
diff --git a/canned/win_net.json b/canned/win_net.json
index fcbb9ab8ea..1367df7c29 100644
--- a/canned/win_net.json
+++ b/canned/win_net.json
@@ -9,12 +9,12 @@
"w": 4,
"h": 4,
"i": "3bf8c678-5904-46e7-9c9f-d0d16f0c3fc4",
- "name": "TX bytes/second",
+ "name": "System - TX Bytes/Second",
"queries": [
{
- "query": "select Bytes_Sent_persec from win_net",
+ "query": "SELECT mean(\"Bytes_Sent_persec\") AS \"bytes_sent\" FROM win_net",
"db": "telegraf",
- "rp": "autogen",
+ "rp": "",
"groupbys": [],
"wheres": []
}
@@ -26,12 +26,12 @@
"w": 4,
"h": 4,
"i": "46963ea2-b09b-4dcf-b08b-7cbcd8766f77",
- "name": "RX bytes/second",
+ "name": "RX Bytes/Second",
"queries": [
{
- "query": "select Bytes_Received_persec from win_net",
+ "query": "SELECT mean(\"Bytes_Received_persec\") AS \"bytes_received\" FROM win_net",
"db": "telegraf",
- "rp": "autogen",
+ "rp": "",
"groupbys": [],
"wheres": []
}
diff --git a/canned/win_system.json b/canned/win_system.json
index f08ea254c9..226f4d2a2b 100644
--- a/canned/win_system.json
+++ b/canned/win_system.json
@@ -9,12 +9,12 @@
"w": 4,
"h": 4,
"i": "d959c815-16a8-4a2b-a6ea-e37af38d4e2f",
- "name": "System Load",
+ "name": "System - Load",
"queries": [
{
- "query": "select Processor_Queue_Length from win_system",
+ "query": "SELECT mean(\"Processor_Queue_Length\") AS \"load\" FROM win_system",
"db": "telegraf",
- "rp": "autogen",
+ "rp": "",
"groupbys": [],
"wheres": []
}
diff --git a/canned/win_websvc.json b/canned/win_websvc.json
index 020493b47e..4f82d9d708 100644
--- a/canned/win_websvc.json
+++ b/canned/win_websvc.json
@@ -9,26 +9,26 @@
"w": 4,
"h": 4,
"i": "3539e3c3-ac15-49d3-9de8-64cd514588ca",
- "name": "Web Service",
+ "name": "IIS - Service",
"queries": [
{
- "query": "select Get_Requests_persec from win_websvc",
+ "query": "SELECT mean(\"Get_Requests_persec\") AS \"gets\" FROM win_websvc",
"db": "telegraf",
- "rp": "autogen",
+ "rp": "",
"groupbys": [],
"wheres": []
},
{
- "query": "select Post_Requests_persec from win_websvc",
+ "query": "SELECT mean(\"Post_Requests_persec\") AS \"posts\" FROM win_websvc",
"db": "telegraf",
- "rp": "autogen",
+ "rp": "",
"groupbys": [],
"wheres": []
},
{
- "query": "select Current_Connections from win_websvc",
+ "query": "SELECT mean(\"Current_Connections\") AS \"connections\" FROM win_websvc",
"db": "telegraf",
- "rp": "autogen",
+ "rp": "",
"groupbys": [],
"wheres": []
}
From 4106158f7598dd0b7dac7aed87a6166f696b1f5e Mon Sep 17 00:00:00 2001
From: nathan haugo <nhaugo@gmail.com>
Date: Fri, 11 Nov 2016 12:44:44 -0800
Subject: [PATCH 2/3] Fix merge conflict
---
canned/nginx.json | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/canned/nginx.json b/canned/nginx.json
index cb6eff52d4..9da2b345d9 100644
--- a/canned/nginx.json
+++ b/canned/nginx.json
@@ -12,11 +12,7 @@
"name": "NGINX – Client Connections",
"queries": [
{
-<<<<<<< 521c294017a685ca2118a74bd4942829ad04f30f
- "query": "select non_negative_derivative(max(\"accepts\"), 1s) as \"accepts\", non_negative_derivative(max(\"handled\"), 1s) as \"handled\", non_negative_derivative(max(\"active\"), 1s) as \"active\" from nginx",
-=======
- "query": "SELECT mean(\"accepts\") AS \"accepts\", mean(\"handled\") AS \"handled\", mean(\"active\") AS \"active\" FROM nginx",
->>>>>>> Cleanup and aggregates of templates
+ "query": "SELECT non_negative_derivative(max(\"accepts\"), 1s) AS \"accepts\", non_negative_derivative(max(\"handled\"), 1s) AS \"handled\", non_negative_derivative(max(\"active\"), 1s) AS \"active\" FROM nginx",
"db": "telegraf",
"rp": "",
"groupbys": [
@@ -35,11 +31,7 @@
"name": "NGINX – Client Errors",
"queries": [
{
-<<<<<<< 521c294017a685ca2118a74bd4942829ad04f30f
- "query": "select non_negative_derivative(max(\"accepts\")) - non_negative_derivative(max(\"handled\")) from nginx",
-=======
- "query": "SELECT mean(\"accepts\") - mean(\"handled\") AS \"dropped\" FROM nginx",
->>>>>>> Cleanup and aggregates of templates
+ "query": "SELECT non_negative_derivative(max(\"accepts\")) - non_negative_derivative(max(\"handled\")) FROM nginx",
"db": "telegraf",
"rp": "",
"groupbys": [
From aaf52579a24f928ac03dfcbd2592e48d8c3994a0 Mon Sep 17 00:00:00 2001
From: nathan haugo <nhaugo@gmail.com>
Date: Fri, 11 Nov 2016 12:57:53 -0800
Subject: [PATCH 3/3] Fix typos
---
canned/disk.json | 4 ++--
canned/kubernetes_pod_network.json | 2 +-
canned/kubernetes_system_container.json | 4 ++--
canned/load.json | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/canned/disk.json b/canned/disk.json
index 6588437c4b..fbe2b54222 100644
--- a/canned/disk.json
+++ b/canned/disk.json
@@ -9,10 +9,10 @@
"w": 4,
"h": 4,
"i": "5825a4dd-df97-4e99-a99d-67b68833c183",
- "name": "Disk used %",
+ "name": "System - Disk used %",
"queries": [
{
- "query": "select mean(\"used_percent\") AS \"used_percent\" from disk",
+ "query": "SELECT mean(\"used_percent\") AS \"used_percent\" FROM disk",
"db": "telegraf",
"rp": "",
"groupbys": [
diff --git a/canned/kubernetes_pod_network.json b/canned/kubernetes_pod_network.json
index c7643489fc..97edf6bbf8 100644
--- a/canned/kubernetes_pod_network.json
+++ b/canned/kubernetes_pod_network.json
@@ -32,7 +32,7 @@
"name": "K8s - Pod RX Bytes/Second ",
"queries": [
{
- "query": "SELECT non_negative_derivative(\"rx_bytes\") AS \"rx_bytes_per_second\" fROM kubernetes_pod_network",
+ "query": "SELECT non_negative_derivative(\"rx_bytes\") AS \"rx_bytes_per_second\" FROM kubernetes_pod_network",
"db": "telegraf",
"rp": "",
"groupbys": [
diff --git a/canned/kubernetes_system_container.json b/canned/kubernetes_system_container.json
index 27d45a12e8..2b7ad5d323 100644
--- a/canned/kubernetes_system_container.json
+++ b/canned/kubernetes_system_container.json
@@ -12,7 +12,7 @@
"name": "K8s - Kubelet Millicores",
"queries": [
{
- "query": "SELECT mean(\"cpu_usage_nanocores\"\) / 1000000 AS \"cpu_usage_millicores\" FROM kubernetes_system_container",
+ "query": "SELECT mean(\"cpu_usage_nanocores\") / 1000000 AS \"cpu_usage_millicores\" FROM kubernetes_system_container",
"db": "telegraf",
"rp": "",
"groupbys": [],
@@ -31,7 +31,7 @@
"name": "K8s - Kubelet Memory Bytes",
"queries": [
{
- "query": "select mean(\"memory_usage_bytes\") AS \"memory_usage_bytes\" FROM kubernetes_system_container",
+ "query": "SELECT mean(\"memory_usage_bytes\") AS \"memory_usage_bytes\" FROM kubernetes_system_container",
"db": "telegraf",
"rp": "",
"groupbys": [],
diff --git a/canned/load.json b/canned/load.json
index c32c6a6d3a..85a5917b97 100644
--- a/canned/load.json
+++ b/canned/load.json
@@ -12,7 +12,7 @@
"name": "System Load",
"queries": [
{
- "query": "SELECT mean(\"load1\") AS \"load" FROM \"telegraf\"..\"system\"",
+ "query": "SELECT mean(\"load1\") AS \"load\" FROM \"telegraf\"..\"system\"",
"db": "telegraf",
"rp": "",
"groupbys": [],