diff --git a/agent/agent.go b/agent/agent.go index 6378b69..67c03fe 100644 --- a/agent/agent.go +++ b/agent/agent.go @@ -25,9 +25,10 @@ import ( _ "flashcat.cloud/categraf/inputs/mem" _ "flashcat.cloud/categraf/inputs/mysql" _ "flashcat.cloud/categraf/inputs/net" - _ "flashcat.cloud/categraf/inputs/netresponse" + _ "flashcat.cloud/categraf/inputs/net_response" _ "flashcat.cloud/categraf/inputs/netstat" _ "flashcat.cloud/categraf/inputs/ntp" + _ "flashcat.cloud/categraf/inputs/nvidia_smi" _ "flashcat.cloud/categraf/inputs/oracle" _ "flashcat.cloud/categraf/inputs/ping" _ "flashcat.cloud/categraf/inputs/processes" diff --git a/conf/input.netresponse/netresponse.toml b/conf/input.net_response/net_response.toml similarity index 100% rename from conf/input.netresponse/netresponse.toml rename to conf/input.net_response/net_response.toml diff --git a/conf/input.nvidiasmi/nvidiasmi.toml b/conf/input.nvidia_smi/nvidia_smi.toml similarity index 100% rename from conf/input.nvidiasmi/nvidiasmi.toml rename to conf/input.nvidia_smi/nvidia_smi.toml diff --git a/inputs/netresponse/README.md b/inputs/net_response/README.md similarity index 100% rename from inputs/netresponse/README.md rename to inputs/net_response/README.md diff --git a/inputs/netresponse/alerts.json b/inputs/net_response/alerts.json similarity index 91% rename from inputs/netresponse/alerts.json rename to inputs/net_response/alerts.json index 611a1cd..a55961e 100644 --- a/inputs/netresponse/alerts.json +++ b/inputs/net_response/alerts.json @@ -5,7 +5,7 @@ "severity": 2, "disabled": 0, "prom_for_duration": 60, - "prom_ql": "netresponse_result_code != 0", + "prom_ql": "net_response_result_code != 0", "prom_eval_interval": 15, "enable_stime": "00:00", "enable_etime": "23:59", diff --git a/inputs/net_response/dashboard.json b/inputs/net_response/dashboard.json new file mode 100644 index 0000000..5f96e07 --- /dev/null +++ b/inputs/net_response/dashboard.json @@ -0,0 +1,19 @@ +[ + { + "name": "TCP探测", + "tags": "", + "configs": "", + "chart_groups": [ + { + "name": "Default chart group", + "weight": 0, + "charts": [ + { + "configs": "{\"targets\":[{\"refId\":\"A\",\"expr\":\"max(net_response_result_code) by (target)\",\"legend\":\"UP?\"},{\"expr\":\"max(net_response_response_time) by (target)\",\"refId\":\"C\",\"legend\":\"latency(s)\"}],\"name\":\"Targets\",\"custom\":{\"showHeader\":true,\"calc\":\"lastNotNull\",\"displayMode\":\"labelValuesToRows\",\"aggrDimension\":\"target\"},\"options\":{\"valueMappings\":[],\"standardOptions\":{}},\"overrides\":[{\"properties\":{\"valueMappings\":[{\"type\":\"special\",\"match\":{\"special\":0},\"result\":{\"text\":\"UP\",\"color\":\"#417505\"}},{\"type\":\"range\",\"match\":{\"special\":1,\"from\":1},\"result\":{\"text\":\"DOWN\",\"color\":\"#e90f0f\"}}],\"standardOptions\":{}},\"matcher\":{\"value\":\"A\"}}],\"version\":\"2.0.0\",\"type\":\"table\",\"layout\":{\"h\":4,\"w\":24,\"x\":0,\"y\":0,\"i\":\"0\"}}", + "weight": 0 + } + ] + } + ] + } + ] \ No newline at end of file diff --git a/inputs/netresponse/netresponse.go b/inputs/net_response/net_response.go similarity index 99% rename from inputs/netresponse/netresponse.go rename to inputs/net_response/net_response.go index b8b7e99..fc0277c 100644 --- a/inputs/netresponse/netresponse.go +++ b/inputs/net_response/net_response.go @@ -1,4 +1,4 @@ -package netresponse +package net_response import ( "bufio" @@ -19,7 +19,7 @@ import ( ) const ( - inputName = "netresponse" + inputName = "net_response" Success uint64 = 0 Timeout uint64 = 1 diff --git a/inputs/netresponse/dashboard.json b/inputs/netresponse/dashboard.json deleted file mode 100644 index 8b5007c..0000000 --- a/inputs/netresponse/dashboard.json +++ /dev/null @@ -1,19 +0,0 @@ -[ - { - "name": "TCP探测", - "tags": "", - "configs": "", - "chart_groups": [ - { - "name": "Default chart group", - "weight": 0, - "charts": [ - { - "configs": "{\"targets\":[{\"refId\":\"A\",\"expr\":\"max(netresponse_result_code) by (target)\",\"legend\":\"UP?\"},{\"expr\":\"max(netresponse_response_time) by (target)\",\"refId\":\"C\",\"legend\":\"latency(s)\"}],\"name\":\"Targets\",\"custom\":{\"showHeader\":true,\"calc\":\"lastNotNull\",\"displayMode\":\"labelValuesToRows\",\"aggrDimension\":\"target\"},\"options\":{\"valueMappings\":[],\"standardOptions\":{}},\"overrides\":[{\"properties\":{\"valueMappings\":[{\"type\":\"special\",\"match\":{\"special\":0},\"result\":{\"text\":\"UP\",\"color\":\"#417505\"}},{\"type\":\"range\",\"match\":{\"special\":1,\"from\":1},\"result\":{\"text\":\"DOWN\",\"color\":\"#e90f0f\"}}],\"standardOptions\":{}},\"matcher\":{\"value\":\"A\"}}],\"version\":\"2.0.0\",\"type\":\"table\",\"layout\":{\"h\":4,\"w\":24,\"x\":0,\"y\":0,\"i\":\"0\"}}", - "weight": 0 - } - ] - } - ] - } - ] \ No newline at end of file diff --git a/inputs/nvidiasmi/builder.go b/inputs/nvidia_smi/builder.go similarity index 99% rename from inputs/nvidiasmi/builder.go rename to inputs/nvidia_smi/builder.go index 16c5de4..cf04ac2 100644 --- a/inputs/nvidiasmi/builder.go +++ b/inputs/nvidia_smi/builder.go @@ -1,4 +1,4 @@ -package nvidiasmi +package nvidia_smi import ( "fmt" diff --git a/inputs/nvidiasmi/csv.go b/inputs/nvidia_smi/csv.go similarity index 99% rename from inputs/nvidiasmi/csv.go rename to inputs/nvidia_smi/csv.go index 2c6490e..dc711d2 100644 --- a/inputs/nvidiasmi/csv.go +++ b/inputs/nvidia_smi/csv.go @@ -1,4 +1,4 @@ -package nvidiasmi +package nvidia_smi import ( "fmt" diff --git a/inputs/nvidiasmi/fields.go b/inputs/nvidia_smi/fields.go similarity index 99% rename from inputs/nvidiasmi/fields.go rename to inputs/nvidia_smi/fields.go index 701853b..9581757 100644 --- a/inputs/nvidiasmi/fields.go +++ b/inputs/nvidia_smi/fields.go @@ -1,4 +1,4 @@ -package nvidiasmi +package nvidia_smi import ( "bytes" diff --git a/inputs/nvidiasmi/nvidiasmi.go b/inputs/nvidia_smi/nvidia_smi.go similarity index 99% rename from inputs/nvidiasmi/nvidiasmi.go rename to inputs/nvidia_smi/nvidia_smi.go index 84bd202..c7b91fe 100644 --- a/inputs/nvidiasmi/nvidiasmi.go +++ b/inputs/nvidia_smi/nvidia_smi.go @@ -1,4 +1,4 @@ -package nvidiasmi +package nvidia_smi // This is a fork of https://github.com/utkuozdemir/nvidia_gpu_exporter diff --git a/inputs/nvidiasmi/parser.go b/inputs/nvidia_smi/parser.go similarity index 98% rename from inputs/nvidiasmi/parser.go rename to inputs/nvidia_smi/parser.go index 764a066..4f0d7dd 100644 --- a/inputs/nvidiasmi/parser.go +++ b/inputs/nvidia_smi/parser.go @@ -1,4 +1,4 @@ -package nvidiasmi +package nvidia_smi import ( "fmt" diff --git a/inputs/nvidiasmi/scrape.go b/inputs/nvidia_smi/scrape.go similarity index 98% rename from inputs/nvidiasmi/scrape.go rename to inputs/nvidia_smi/scrape.go index 0e06b8d..6596ca7 100644 --- a/inputs/nvidiasmi/scrape.go +++ b/inputs/nvidia_smi/scrape.go @@ -1,4 +1,4 @@ -package nvidiasmi +package nvidia_smi import ( "bytes" diff --git a/inputs/nvidiasmi/types.go b/inputs/nvidia_smi/types.go similarity index 97% rename from inputs/nvidiasmi/types.go rename to inputs/nvidia_smi/types.go index 93464a1..f722ca6 100644 --- a/inputs/nvidiasmi/types.go +++ b/inputs/nvidia_smi/types.go @@ -1,4 +1,4 @@ -package nvidiasmi +package nvidia_smi import ( "errors" diff --git a/inputs/nvidiasmi/util.go b/inputs/nvidia_smi/util.go similarity index 97% rename from inputs/nvidiasmi/util.go rename to inputs/nvidia_smi/util.go index 01e93a7..d7e039b 100644 --- a/inputs/nvidiasmi/util.go +++ b/inputs/nvidia_smi/util.go @@ -1,4 +1,4 @@ -package nvidiasmi +package nvidia_smi import ( "regexp"