From 6d77e5475c95e872adcc388c7433229e3c13a36b Mon Sep 17 00:00:00 2001 From: Chris Goller Date: Thu, 10 Nov 2016 17:28:06 -0600 Subject: [PATCH] Update layouts to default to x/y/w/h of 4 --- canned/kubernetes_node.json | 6 +++--- canned/kubernetes_pod_container.json | 4 ++-- canned/kubernetes_pod_network.json | 6 +++--- canned/kubernetes_system_container.json | 6 +++--- canned/mem.json | 4 ++-- canned/netstat.json | 10 +++++----- canned/processes.json | 4 ++-- canned/win_cpu.json | 6 +++--- canned/win_mem.json | 4 ++-- canned/win_net.json | 10 +++++----- canned/win_system.json | 24 ++++++++++++++++++++++++ canned/win_websvc.json | 4 ++-- 12 files changed, 56 insertions(+), 32 deletions(-) create mode 100644 canned/win_system.json diff --git a/canned/kubernetes_node.json b/canned/kubernetes_node.json index b9a56a2f3..9be96989e 100644 --- a/canned/kubernetes_node.json +++ b/canned/kubernetes_node.json @@ -9,7 +9,7 @@ "w": 4, "h": 4, "i": "5f406919-14b8-4c01-b0ce-f8ed75310805", - "name": "Node cpu usage millicores", + "name": "K8s node millicores", "queries": [ { "query": "select \"cpu_usage_nanocores\" / 1000000 as cpu_usage_millicores from kubernetes_node", @@ -23,12 +23,12 @@ ] }, { - "x": 10, + "x": 4, "y": 0, "w": 4, "h": 4, "i": "042d47cc-fcfd-4b26-a690-d81c0321d408", - "name": "Node memory usage bytes", + "name": "K8s node memory bytes", "queries": [ { "query": "select \"memory_usage_bytes\" from kubernetes_node", diff --git a/canned/kubernetes_pod_container.json b/canned/kubernetes_pod_container.json index c42cf4376..82f74ce90 100644 --- a/canned/kubernetes_pod_container.json +++ b/canned/kubernetes_pod_container.json @@ -9,7 +9,7 @@ "w": 4, "h": 4, "i": "e2427235-c81b-42a1-afdf-80d340fc01f8", - "name": "Pod cpu usage millicores", + "name": "K8s pod millicores", "queries": [ { "query": "select \"cpu_usage_nanocores\" / 1000000 as cpu_usage_millicores from kubernetes_pod_container", @@ -28,7 +28,7 @@ "w": 4, "h": 4, "i": "6edb8c61-f723-47ce-a7eb-904fc6fe066e", - "name": "Pod memory usage bytes", + "name": "K8s pod memory bytes", "queries": [ { "query": "select \"memory_usage_bytes\" from kubernetes_pod_container", diff --git a/canned/kubernetes_pod_network.json b/canned/kubernetes_pod_network.json index ebf98e926..b10c226ba 100644 --- a/canned/kubernetes_pod_network.json +++ b/canned/kubernetes_pod_network.json @@ -9,7 +9,7 @@ "w": 4, "h": 4, "i": "0e06ddcd-05dd-493f-9dba-a382300a7190", - "name": "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", @@ -24,12 +24,12 @@ ] }, { - "x": 10, + "x": 4, "y": 0, "w": 4, "h": 4, "i": "cc062b4c-70ca-4bd7-b372-398e734feb49", - "name": "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", diff --git a/canned/kubernetes_system_container.json b/canned/kubernetes_system_container.json index 0c1274f83..bea864e78 100644 --- a/canned/kubernetes_system_container.json +++ b/canned/kubernetes_system_container.json @@ -9,7 +9,7 @@ "w": 4, "h": 4, "i": "64cf0f60-e157-4c03-9d7e-c280a7e2695f", - "name": "Kubelet cpu usage millicores", + "name": "K8s Kubelet millicores", "queries": [ { "query": "select \"cpu_usage_nanocores\" / 1000000 as cpu_usage_millicores from kubernetes_system_container", @@ -23,12 +23,12 @@ ] }, { - "x": 10, + "x": 4, "y": 0, "w": 4, "h": 4, "i": "4a7454d1-4d60-4077-9e7b-8c915a00fe66", - "name": "Kubelet memory usage bytes", + "name": "K8s Kubelet memory bytes", "queries": [ { "query": "select \"memory_usage_bytes\" from kubernetes_system_container", diff --git a/canned/mem.json b/canned/mem.json index 1cfd73841..cf7737905 100644 --- a/canned/mem.json +++ b/canned/mem.json @@ -9,10 +9,10 @@ "w": 4, "h": 4, "i": "e6e5063c-43d5-409b-a0ab-68da51ed3f28", - "name": "Memory usage", + "name": "Memory bytes used", "queries": [ { - "query": "SELECT \"used_percent\" FROM \"telegraf\"..\"mem\"", + "query": "SELECT \"used\", \"available\" FROM \"telegraf\"..\"mem\"", "db": "telegraf", "rp": "autogen", "groupbys": [], diff --git a/canned/netstat.json b/canned/netstat.json index 6664b812f..e1626ef57 100644 --- a/canned/netstat.json +++ b/canned/netstat.json @@ -6,8 +6,8 @@ { "x": 0, "y": 0, - "w": 10, - "h": 10, + "w": 4, + "h": 4, "i": "cf5d0608-b513-4244-a55f-accf520da3a1", "name": "Open sockets", "queries": [ @@ -28,10 +28,10 @@ ] }, { - "x": 10, + "x": 4, "y": 0, - "w": 10, - "h": 10, + "w": 4, + "h": 4, "i": "63503235-a588-49a7-ae0a-fb015c888e5b", "name": "Sockets created/second ", "queries": [ diff --git a/canned/processes.json b/canned/processes.json index 7ffa7e344..6901bf92a 100644 --- a/canned/processes.json +++ b/canned/processes.json @@ -6,8 +6,8 @@ { "x": 0, "y": 0, - "w": 10, - "h": 10, + "w": 4, + "h": 4, "i": "84048146-f93d-4d6c-b7dd-c8e2a68abb27", "name": "Total Processes", "queries": [ diff --git a/canned/win_cpu.json b/canned/win_cpu.json index c7e4a7640..5c22c6c8f 100644 --- a/canned/win_cpu.json +++ b/canned/win_cpu.json @@ -6,10 +6,10 @@ { "x": 0, "y": 0, - "w": 10, - "h": 10, + "w": 4, + "h": 4, "i": "6921e19a-951e-42ef-b304-2b8b661fcc81", - "name": "Processor", + "name": "CPU Usage", "queries": [ { "query": "select Percent_Processor_Time from win_cpu", diff --git a/canned/win_mem.json b/canned/win_mem.json index f135347f0..d07db5967 100644 --- a/canned/win_mem.json +++ b/canned/win_mem.json @@ -6,8 +6,8 @@ { "x": 0, "y": 0, - "w": 10, - "h": 10, + "w": 4, + "h": 4, "i": "1c275ca5-84a7-4146-9cf0-8ed654abb627", "name": "Available bytes", "queries": [ diff --git a/canned/win_net.json b/canned/win_net.json index c40f40855..2586b63ac 100644 --- a/canned/win_net.json +++ b/canned/win_net.json @@ -6,8 +6,8 @@ { "x": 0, "y": 0, - "w": 10, - "h": 10, + "w": 4, + "h": 4, "i": "3bf8c678-5904-46e7-9c9f-d0d16f0c3fc4", "name": "TX bytes/second", "queries": [ @@ -21,10 +21,10 @@ ] }, { - "x": 10, + "x": 4, "y": 0, - "w": 10, - "h": 10, + "w": 4, + "h": 4, "i": "46963ea2-b09b-4dcf-b08b-7cbcd8766f77", "name": "RX bytes/second", "queries": [ diff --git a/canned/win_system.json b/canned/win_system.json new file mode 100644 index 000000000..228742d45 --- /dev/null +++ b/canned/win_system.json @@ -0,0 +1,24 @@ +{ + "id": "96bd0303-19b6-4f87-a0f9-2755c6178ba7", + "measurement": "win_system", + "app": "system", + "cells": [ + { + "x": 0, + "y": 0, + "w": 4, + "h": 4, + "i": "d959c815-16a8-4a2b-a6ea-e37af38d4e2f", + "name": "System Load", + "queries": [ + { + "query": "select Processor_Queue_Length from win_system", + "db": "telegraf", + "rp": "autogen", + "groupbys": [], + "wheres": [] + } + ] + } + ] +} diff --git a/canned/win_websvc.json b/canned/win_websvc.json index 2850177e5..f46ea9673 100644 --- a/canned/win_websvc.json +++ b/canned/win_websvc.json @@ -6,8 +6,8 @@ { "x": 0, "y": 0, - "w": 10, - "h": 10, + "w": 4, + "h": 4, "i": "3539e3c3-ac15-49d3-9de8-64cd514588ca", "name": "Web Service", "queries": [