Skip to content

Commit

Permalink
passim: normalize query case
Browse files Browse the repository at this point in the history
Make SELECT, AS, FROM consistently upper case in query, so future batch
replacements work properly.
  • Loading branch information
pabigot committed Nov 12, 2018
1 parent 794df96 commit 1d9fcd8
Show file tree
Hide file tree
Showing 12 changed files with 34 additions and 34 deletions.
4 changes: 2 additions & 2 deletions canned/consul.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"name": "Consul – Number of Critical Health Checks",
"queries": [
{
"query": "SELECT count(\"check_id\") as \"Number Critical\" FROM \":db:\".\":rp:\".\"consul_health_checks\"",
"query": "SELECT count(\"check_id\") AS \"Number Critical\" FROM \":db:\".\":rp:\".\"consul_health_checks\"",
"label": "count",
"groupbys": [
"\"service_name\""
Expand All @@ -33,7 +33,7 @@
"name": "Consul – Number of Warning Health Checks",
"queries": [
{
"query": "SELECT count(\"check_id\") as \"Number Warning\" FROM \":db:\".\":rp:\".\"consul_health_checks\"",
"query": "SELECT count(\"check_id\") AS \"Number Warning\" FROM \":db:\".\":rp:\".\"consul_health_checks\"",
"label": "count",
"groupbys": [
"\"service_name\""
Expand Down
2 changes: 1 addition & 1 deletion canned/consul_leadership.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"name": "Consul – Leadership Change",
"queries": [
{
"query": "SELECT max(\"value\") as \"change\" FROM \":db:\".\":rp:\".\"consul_raft_state_leader\"",
"query": "SELECT max(\"value\") AS \"change\" FROM \":db:\".\":rp:\".\"consul_raft_state_leader\"",
"label": "count",
"groupbys": [],
"wheres": []
Expand Down
20 changes: 10 additions & 10 deletions canned/elasticsearch.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"name": "ElasticSearch - Query Throughput",
"queries": [
{
"query": "select non_negative_derivative(mean(search_query_total)) as searches_per_min, non_negative_derivative(mean(search_scroll_total)) as scrolls_per_min, non_negative_derivative(mean(search_fetch_total)) as fetches_per_min, non_negative_derivative(mean(search_suggest_total)) as suggests_per_min from elasticsearch_indices",
"query": "SELECT non_negative_derivative(mean(search_query_total)) AS searches_per_min, non_negative_derivative(mean(search_scroll_total)) AS scrolls_per_min, non_negative_derivative(mean(search_fetch_total)) AS fetches_per_min, non_negative_derivative(mean(search_suggest_total)) AS suggests_per_min FROM elasticsearch_indices",
"groupbys": [],
"wheres": []
}
Expand All @@ -28,7 +28,7 @@
"name": "ElasticSearch - Open Connections",
"queries": [
{
"query": "select mean(current_open) from elasticsearch_http",
"query": "SELECT mean(current_open) FROM elasticsearch_http",
"groupbys": [],
"wheres": []
}
Expand All @@ -43,7 +43,7 @@
"name": "ElasticSearch - Query Latency",
"queries": [
{
"query": "select non_negative_derivative(mean(search_query_time_in_millis)) as mean, non_negative_derivative(median(search_query_time_in_millis)) as median, non_negative_derivative(percentile(search_query_time_in_millis, 95)) as ninety_fifth from elasticsearch_indices",
"query": "SELECT non_negative_derivative(mean(search_query_time_in_millis)) AS mean, non_negative_derivative(median(search_query_time_in_millis)) AS median, non_negative_derivative(percentile(search_query_time_in_millis, 95)) AS ninety_fifth FROM elasticsearch_indices",
"groupbys": [],
"wheres": []
}
Expand All @@ -58,7 +58,7 @@
"name": "ElasticSearch - Fetch Latency",
"queries": [
{
"query": "select non_negative_derivative(mean(search_fetch_time_in_millis)) as mean, non_negative_derivative(median(search_fetch_time_in_millis)) as median, non_negative_derivative(percentile(search_fetch_time_in_millis, 95)) as ninety_fifth from elasticsearch_indices",
"query": "SELECT non_negative_derivative(mean(search_fetch_time_in_millis)) AS mean, non_negative_derivative(median(search_fetch_time_in_millis)) AS median, non_negative_derivative(percentile(search_fetch_time_in_millis, 95)) AS ninety_fifth FROM elasticsearch_indices",
"groupbys": [],
"wheres": []
}
Expand All @@ -73,7 +73,7 @@
"name": "ElasticSearch - Suggest Latency",
"queries": [
{
"query": "select non_negative_derivative(mean(search_suggest_time_in_millis)) as mean, non_negative_derivative(median(search_suggest_time_in_millis)) as median, non_negative_derivative(percentile(search_suggest_time_in_millis, 95)) as ninety_fifth from elasticsearch_indices",
"query": "SELECT non_negative_derivative(mean(search_suggest_time_in_millis)) AS mean, non_negative_derivative(median(search_suggest_time_in_millis)) AS median, non_negative_derivative(percentile(search_suggest_time_in_millis, 95)) AS ninety_fifth FROM elasticsearch_indices",
"groupbys": [],
"wheres": []
}
Expand All @@ -88,7 +88,7 @@
"name": "ElasticSearch - Scroll Latency",
"queries": [
{
"query": "select non_negative_derivative(mean(search_scroll_time_in_millis)) as mean, non_negative_derivative(median(search_scroll_time_in_millis)) as median, non_negative_derivative(percentile(search_scroll_time_in_millis, 95)) as ninety_fifth from elasticsearch_indices",
"query": "SELECT non_negative_derivative(mean(search_scroll_time_in_millis)) AS mean, non_negative_derivative(median(search_scroll_time_in_millis)) AS median, non_negative_derivative(percentile(search_scroll_time_in_millis, 95)) AS ninety_fifth FROM elasticsearch_indices",
"groupbys": [],
"wheres": []
}
Expand All @@ -103,7 +103,7 @@
"name": "ElasticSearch - Indexing Latency",
"queries": [
{
"query": "select non_negative_derivative(mean(indexing_index_time_in_millis)) as mean from elasticsearch_indices",
"query": "SELECT non_negative_derivative(mean(indexing_index_time_in_millis)) AS mean FROM elasticsearch_indices",
"groupbys": [],
"wheres": []
}
Expand All @@ -118,7 +118,7 @@
"name": "ElasticSearch - JVM GC Collection Counts",
"queries": [
{
"query": "select mean(gc_collectors_old_collection_count) as old_count, mean(gc_collectors_young_collection_count) as young_count from elasticsearch_jvm",
"query": "SELECT mean(gc_collectors_old_collection_count) AS old_count, mean(gc_collectors_young_collection_count) AS young_count FROM elasticsearch_jvm",
"groupbys": [],
"wheres": []
}
Expand All @@ -133,7 +133,7 @@
"name": "ElasticSearch - JVM GC Latency",
"queries": [
{
"query": "select non_negative_derivative(mean(gc_collectors_old_collection_time_in_millis)) as mean_old_time, non_negative_derivative(mean(gc_collectors_young_collection_time_in_millis)) as mean_young_time from elasticsearch_jvm",
"query": "SELECT non_negative_derivative(mean(gc_collectors_old_collection_time_in_millis)) AS mean_old_time, non_negative_derivative(mean(gc_collectors_young_collection_time_in_millis)) AS mean_young_time FROM elasticsearch_jvm",
"groupbys": [],
"wheres": []
}
Expand All @@ -148,7 +148,7 @@
"name": "ElasticSearch - JVM Heap Usage",
"queries": [
{
"query": "select mean(mem_heap_used_percent) from elasticsearch_jvm",
"query": "SELECT mean(mem_heap_used_percent) FROM elasticsearch_jvm",
"groupbys": [],
"wheres": []
}
Expand Down
2 changes: 1 addition & 1 deletion canned/haproxy.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"name": "HAProxy – Number of Servers",
"queries": [
{
"query": "select mean(\"active_servers\") AS active_servers, mean(\"backup_servers\") AS backup_servers FROM \":db:\".\":rp:\".\"haproxy\"",
"query": "SELECT mean(\"active_servers\") AS active_servers, mean(\"backup_servers\") AS backup_servers FROM \":db:\".\":rp:\".\"haproxy\"",
"groupbys": [],
"wheres": []
}
Expand Down
6 changes: 3 additions & 3 deletions canned/mongodb.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"name": "MongoDB – Reads/Writes Waiting in Queue",
"queries": [
{
"query": "SELECT max(queued_reads) AS queued_reads, max(queued_writes) as queued_writes FROM \":db:\".\":rp:\".\"mongodb\"",
"query": "SELECT max(queued_reads) AS queued_reads, max(queued_writes) AS queued_writes FROM \":db:\".\":rp:\".\"mongodb\"",
"label": "count",
"groupbys": [],
"wheres": []
Expand All @@ -77,7 +77,7 @@
"name": "MongoDB – Network Bytes/Second",
"queries": [
{
"query": "SELECT mean(net_in_bytes) AS net_in_bytes, mean(net_out_bytes) as net_out_bytes FROM \":db:\".\":rp:\".\"mongodb\"",
"query": "SELECT mean(net_in_bytes) AS net_in_bytes, mean(net_out_bytes) AS net_out_bytes FROM \":db:\".\":rp:\".\"mongodb\"",
"label": "bytes/s",
"groupbys": [],
"wheres": []
Expand Down Expand Up @@ -109,7 +109,7 @@
"name": "MongoDB – Memory Usage (MB)",
"queries": [
{
"query": "SELECT mean(vsize_megabytes) AS virtual_memory_megabytes, mean(resident_megabytes) as resident_memory_megabytes FROM \":db:\".\":rp:\".\"mongodb\"",
"query": "SELECT mean(vsize_megabytes) AS virtual_memory_megabytes, mean(resident_megabytes) AS resident_memory_megabytes FROM \":db:\".\":rp:\".\"mongodb\"",
"label": "MB",
"groupbys": [],
"wheres": []
Expand Down
8 changes: 4 additions & 4 deletions canned/net.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
"name": "System – Network Mb/s",
"queries": [
{
"query": "SELECT non_negative_derivative(max(\"bytes_recv\"), 1s) / 125000 as \"rx_megabits_per_second\" FROM \":db:\".\":rp:\".\"net\"",
"query": "SELECT non_negative_derivative(max(\"bytes_recv\"), 1s) / 125000 AS \"rx_megabits_per_second\" FROM \":db:\".\":rp:\".\"net\"",
"groupbys": [],
"wheres": [],
"label": "Mb/s"
},
{
"query": "SELECT non_negative_derivative(max(\"bytes_sent\"), 1s) / 125000 as \"tx_megabits_per_second\" FROM \":db:\".\":rp:\".\"net\"",
"query": "SELECT non_negative_derivative(max(\"bytes_sent\"), 1s) / 125000 AS \"tx_megabits_per_second\" FROM \":db:\".\":rp:\".\"net\"",
"groupbys": [],
"wheres": []
}
Expand All @@ -34,12 +34,12 @@
"name": "System – Network Error Rate",
"queries": [
{
"query": "SELECT non_negative_derivative(max(\"err_in\"), 1s) / 125000 as \"tx_errors_per_second\" FROM \":db:\".\":rp:\".\"net\"",
"query": "SELECT non_negative_derivative(max(\"err_in\"), 1s) / 125000 AS \"tx_errors_per_second\" FROM \":db:\".\":rp:\".\"net\"",
"groupbys": [],
"wheres": []
},
{
"query": "SELECT non_negative_derivative(max(\"err_out\"), 1s) / 125000 as \"rx_errors_per_second\" FROM \":db:\".\":rp:\".\"net\"",
"query": "SELECT non_negative_derivative(max(\"err_out\"), 1s) / 125000 AS \"rx_errors_per_second\" FROM \":db:\".\":rp:\".\"net\"",
"groupbys": [],
"wheres": []
}
Expand Down
2 changes: 1 addition & 1 deletion canned/new_apps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ cat > $APP_FILE << EOF
"i": "$CELLID",
"name": "User facing cell Name",
"queries": [{
"query": "select mean(\"used_percent\") from disk",
"query": "SELECT mean(\"used_percent\") FROM disk",
"groupbys": [],
"wheres": []
}]
Expand Down
2 changes: 1 addition & 1 deletion canned/phpfpm.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"name": "phpfpm – Processes",
"queries": [
{
"query": "SELECT mean(\"active_processes\") as \"active\",mean(\"idle_processes\") as \"idle\" FROM \":db:\".\":rp:\".\"phpfpm\"",
"query": "SELECT mean(\"active_processes\") AS \"active\",mean(\"idle_processes\") AS \"idle\" FROM \":db:\".\":rp:\".\"phpfpm\"",
"label": "count",
"groupbys": [
"\"pool\""
Expand Down
4 changes: 2 additions & 2 deletions canned/ping.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"name": "Ping – Packet Loss Percent",
"queries": [
{
"query": "select max(\"percent_packet_loss\") as \"packet_loss\" from \":db:\".\":rp:\".ping",
"query": "SELECT max(\"percent_packet_loss\") AS \"packet_loss\" FROM \":db:\".\":rp:\".ping",
"groupbys": [
"\"url\""
],
Expand All @@ -30,7 +30,7 @@
"name": "Ping – Response Times (ms)",
"queries": [
{
"query": "select mean(\"average_response_ms\") as \"average\", mean(\"minimum_response_ms\") as \"min\", mean(\"maximum_response_ms\") as \"max\" from \":db:\".\":rp:\".ping",
"query": "SELECT mean(\"average_response_ms\") AS \"average\", mean(\"minimum_response_ms\") AS \"min\", mean(\"maximum_response_ms\") AS \"max\" FROM \":db:\".\":rp:\".ping",
"groupbys": [
"\"url\""
],
Expand Down
14 changes: 7 additions & 7 deletions canned/rabbitmq.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@
"name": "RabbitMQ - Overview",
"queries": [
{
"query": "select mean(\"consumers\") AS \"consumers\" from rabbitmq_overview",
"query": "SELECT mean(\"consumers\") AS \"consumers\" FROM rabbitmq_overview",
"groupbys": [],
"wheres": []
},
{
"query": "select mean(\"exchanges\") AS \"exchanges\" from rabbitmq_overview",
"query": "SELECT mean(\"exchanges\") AS \"exchanges\" FROM rabbitmq_overview",
"groupbys": [],
"wheres": []
},
{
"query": "select mean(\"queues\") AS \"queues\" from rabbitmq_overview",
"query": "SELECT mean(\"queues\") AS \"queues\" FROM rabbitmq_overview",
"groupbys": [],
"wheres": []
}
Expand All @@ -37,12 +37,12 @@
"name": "RabbitMQ - Published/Delivered per second",
"queries": [
{
"query": "select derivative(mean(\"messages_published\"), 1s) AS \"published_per_sec\" from rabbitmq_overview",
"query": "SELECT derivative(mean(\"messages_published\"), 1s) AS \"published_per_sec\" FROM rabbitmq_overview",
"groupbys": [],
"wheres": []
},
{
"query": "select derivative(mean(\"messages_delivered\"), 1s) AS \"delivered_per_sec\" from rabbitmq_overview",
"query": "SELECT derivative(mean(\"messages_delivered\"), 1s) AS \"delivered_per_sec\" FROM rabbitmq_overview",
"groupbys": [],
"wheres": []
}
Expand All @@ -57,12 +57,12 @@
"name": "RabbitMQ - Acked/Unacked per second",
"queries": [
{
"query": "select derivative(mean(\"messages_acked\"), 1s) AS \"acked_per_sec\" from rabbitmq_overview",
"query": "SELECT derivative(mean(\"messages_acked\"), 1s) AS \"acked_per_sec\" FROM rabbitmq_overview",
"groupbys": [],
"wheres": []
},
{
"query": "select derivative(mean(\"messages_unacked\"), 1s) AS \"unacked_per_sec\" from rabbitmq_overview",
"query": "SELECT derivative(mean(\"messages_unacked\"), 1s) AS \"unacked_per_sec\" FROM rabbitmq_overview",
"groupbys": [],
"wheres": []
}
Expand Down
2 changes: 1 addition & 1 deletion canned/riak.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"name": "Riak – Total Memory Bytes",
"queries": [
{
"query": "SELECT max(\"memory_total\") as memory_total_bytes FROM \":db:\".\":rp:\".\"riak\"",
"query": "SELECT max(\"memory_total\") AS memory_total_bytes FROM \":db:\".\":rp:\".\"riak\"",
"groupbys": [
"\"nodename\""
],
Expand Down
2 changes: 1 addition & 1 deletion canned/varnish.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"name": "Varnish - Cache Hits/Misses",
"queries": [
{
"query": "select non_negative_derivative(mean(cache_hit)) as hits, non_negative_derivative(mean(cache_miss)) as misses from varnish",
"query": "SELECT non_negative_derivative(mean(cache_hit)) AS hits, non_negative_derivative(mean(cache_miss)) AS misses FROM varnish",
"groupbys": [],
"wheres": []
}
Expand Down

0 comments on commit 1d9fcd8

Please sign in to comment.