From dc3aad9b33057665ec2342b353363489ff9e347e Mon Sep 17 00:00:00 2001 From: nathan haugo Date: Fri, 11 Nov 2016 12:44:44 -0800 Subject: [PATCH] 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 cb6eff52d..9da2b345d 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": [