diff --git a/httpdocs/templates/am_add_host_modal.html b/httpdocs/templates/am_add_host_modal.html index 27e6289bcf..e4bab8865a 100644 --- a/httpdocs/templates/am_add_host_modal.html +++ b/httpdocs/templates/am_add_host_modal.html @@ -64,7 +64,7 @@
+ href="{{ntop.getHttpPrefix()}}/lua/admin/manage_pools.lua?page=active_monitoring&pool=0&referer=/lua/monitor/active_monitoring_monitor.lua">
diff --git a/httpdocs/templates/am_edit_host_modal.html b/httpdocs/templates/am_edit_host_modal.html index 8aff4e8172..67c4dfb9a6 100644 --- a/httpdocs/templates/am_edit_host_modal.html +++ b/httpdocs/templates/am_edit_host_modal.html @@ -64,7 +64,7 @@
+ href="{{ntop.getHttpPrefix()}}/lua/admin/manage_pools.lua?page=active_monitoring&pool=0&referer=/lua/monitor/active_monitoring_monitor.lua">
diff --git a/scripts/callbacks/5minute/system/export_influxdb_stats.lua b/scripts/callbacks/5minute/system/export_influxdb_stats.lua new file mode 100644 index 0000000000..c912f400f2 --- /dev/null +++ b/scripts/callbacks/5minute/system/export_influxdb_stats.lua @@ -0,0 +1,23 @@ +-- +-- (C) 2019-21 - ntop.org +-- + +local dirs = ntop.getDirs() +package.path = dirs.installdir .. "/scripts/lua/modules/?.lua;" .. package.path +package.path = dirs.installdir .. "/scripts/lua/modules/timeseries/?.lua;" .. package.path + +local ts_utils = require "ts_utils_core" +local influxdb_export_api = require "influxdb_export_api" + +-- ############################################## + +if influxdb_export_api.isInfluxdbEnabled() then + local influxdb = ts_utils.getQueryDriver() + local when = os.time() + + influxdb_export_api.exportStats(when, influxdb) + influxdb_export_api.measureRtt(when, influxdb) + influxdb_export_api.exportStorageSize(when, influxdb) +end + +-- ############################################## diff --git a/scripts/callbacks/hourly/system/disk_monitor.lua b/scripts/callbacks/hourly/system/disk_monitor.lua new file mode 100644 index 0000000000..0b9c1e45eb --- /dev/null +++ b/scripts/callbacks/hourly/system/disk_monitor.lua @@ -0,0 +1,13 @@ +-- +-- (C) 2019-21 - ntop.org +-- + +local dirs = ntop.getDirs() +package.path = dirs.installdir .. "/scripts/lua/modules/?.lua;" .. package.path + +local storage_utils = require("storage_utils") + +-- ############################################## + +storage_utils.storageInfo(true --[[ refresh cache ]], 120 --[[ Allow a couple of minutes --]]) + \ No newline at end of file diff --git a/scripts/callbacks/minute/system/influxdb_checks.lua b/scripts/callbacks/minute/system/influxdb_checks.lua new file mode 100644 index 0000000000..66848a3a66 --- /dev/null +++ b/scripts/callbacks/minute/system/influxdb_checks.lua @@ -0,0 +1,35 @@ +-- +-- (C) 2019-21 - ntop.org +-- + +local dirs = ntop.getDirs() +package.path = dirs.installdir .. "/scripts/lua/modules/?.lua;" .. package.path +package.path = dirs.installdir .. "/scripts/lua/modules/timeseries/?.lua;" .. package.path + +local ts_utils = require "ts_utils_core" +local alerts_api = require "alerts_api" +local alert_consts = require "alert_consts" +local influxdb_export_api = require "influxdb_export_api" + +-- ############################################## + +if influxdb_export_api.isInfluxdbEnabled() then + -- Defines an hook which is executed every minute + local last_error = ntop.getCache("ntopng.cache.influxdb.last_error") + + -- Note: last_error is automatically cleared once the error is gone + if(not isEmptyString(last_error)) then + local influxdb = ts_utils.getQueryDriver() + + local alert_type = alert_consts.alert_types.alert_influxdb_error.new( + last_error + ) + + alert_type:set_score_error() + alert_type:set_granularity(alert_consts.alerts_granularities.min) + + alert_type:store(alerts_api.systemEntity()) + end +end + +-- ############################################## diff --git a/scripts/callbacks/minute/system/redis_timeseries.lua b/scripts/callbacks/minute/system/redis_timeseries.lua new file mode 100644 index 0000000000..4df410d9f5 --- /dev/null +++ b/scripts/callbacks/minute/system/redis_timeseries.lua @@ -0,0 +1,50 @@ +-- +-- (C) 2019-21 - ntop.org +-- + +local dirs = ntop.getDirs() +package.path = dirs.installdir .. "/scripts/lua/modules/?.lua;" .. package.path +package.path = dirs.installdir .. "/scripts/lua/modules/timeseries/?.lua;" .. package.path + +local ts_dump = require "ts_min_dump_utils" +local ts_utils = require("ts_utils_core") +local checks = require("checks") +local json = require("dkjson") +local redis_api = require "redis_api" + +local ifid = getSystemInterfaceId() +local hits_key = "ntopng.cache.redis.stats" +local hits_stats = ntop.getCacheStats() +local old_hits_stats = ntop.getCache(hits_key) + +-- ############################################## + +if redis_api.redisTimeseriesEnabled() then + local stats = redis_api.getStats() + + if(not isEmptyString(old_hits_stats)) then + old_hits_stats = json.decode(old_hits_stats) or {} + else + old_hits_stats = {} + end + + if stats["memory"] then + ts_utils.append("redis:memory", { ifid = ifid, resident_bytes = stats["memory"] }, when) + end + + if stats["dbsize"] then + ts_utils.append("redis:keys", {ifid = ifid, num_keys = stats["dbsize"]}, when) + end + + for key, val in pairs(hits_stats) do + if(old_hits_stats[key] ~= nil) then + local delta = math.max(val - old_hits_stats[key], 0) + + -- Dump the delta value as a gauge + ts_utils.append("redis:hits", {ifid = ifid, command = key, num_calls = delta}, when) + end + end + + ntop.setCache(hits_key, json.encode(hits_stats)) +end + diff --git a/scripts/callbacks/minute/system/system_checks.lua b/scripts/callbacks/minute/system/system_checks.lua index 3e733edeb3..479a82a113 100644 --- a/scripts/callbacks/minute/system/system_checks.lua +++ b/scripts/callbacks/minute/system/system_checks.lua @@ -15,17 +15,11 @@ local checks = require "checks" -- -- The following checks are loaded -- --- /var/lib/ntopng/plugins1/callbacks/system/system/influxdb_monitor.lua -- /var/lib/ntopng/plugins1/callbacks/system/system/ids_ips_log.lua -- /var/lib/ntopng/plugins1/callbacks/system/system/dropped_alerts.lua -- /var/lib/ntopng/plugins1/callbacks/system/system/periodic_activity_not_executed.lua --- /var/lib/ntopng/plugins1/callbacks/system/system/redis_monitor.lua --- /var/lib/ntopng/plugins1/callbacks/system/system/disk_monitor.lua --- /var/lib/ntopng/plugins1/callbacks/system/system/alerts_ts.lua -- /var/lib/ntopng/plugins1/callbacks/system/system/clickhouse_monitor.lua -- /var/lib/ntopng/plugins1/callbacks/system/system/slow_periodic_activity.lua --- /var/lib/ntopng/plugins1/callbacks/system/system/memory_ts.lua --- /var/lib/ntopng/plugins1/callbacks/system/system/active_monitoring.lua -- -- ################################################################# diff --git a/scripts/callbacks/minute/system/timeseries.lua b/scripts/callbacks/minute/system/timeseries.lua index 4f69ecb0b5..f13e472d44 100644 --- a/scripts/callbacks/minute/system/timeseries.lua +++ b/scripts/callbacks/minute/system/timeseries.lua @@ -8,12 +8,17 @@ package.path = dirs.installdir .. "/scripts/lua/modules/pools/?.lua;" .. package local scripts_triggers = require "scripts_triggers" local prefs_dump_utils = require "prefs_dump_utils" +local cpu_utils = require("cpu_utils") +local ts_utils = require("ts_utils_core") + +local system_host_stats = cpu_utils.systemHostStats() +local ifstats = interface.getStats() +local when = os.time() -- Check and possibly dump preferences to a file prefs_dump_utils.check_dump_prefs_to_disk() -local ifstats = interface.getStats() -local when = os.time() +-- ##################################### -- Dump periodic activities duration if the telementry timeseries preference is enabled if scripts_triggers.isRrdInterfaceCreation() then @@ -22,11 +27,33 @@ if scripts_triggers.isRrdInterfaceCreation() then ts_dump.update_internals_periodic_activities_stats(when, ifstats, false) end -if scripts_triggers.isRrdInterfaceCreation() then - local ts_utils = require("ts_utils_core") +-- ##################################### +if scripts_triggers.isRrdInterfaceCreation() then if areAlertsEnabled() then ts_utils.append("iface:engaged_alerts", {ifid=getSystemInterfaceId(), engaged_alerts=ifstats.num_alerts_engaged}, when) ts_utils.append("iface:dropped_alerts", {ifid=getSystemInterfaceId(), dropped_alerts=ifstats.num_dropped_alerts}, when) end end + +-- ##################################### + +if cpu_utils.processTimeseriesEnabled() then + ts_utils.append("process:num_alerts", { + ifid = getSystemInterfaceId(), + dropped_alerts = system_host_stats.dropped_alerts or 0, + written_alerts = system_host_stats.written_alerts or 0, + alerts_queries = system_host_stats.alerts_queries or 0 + }, when, verbose) + + -- ##################################### + + if((system_host_stats.mem_ntopng_resident ~= nil) and (system_host_stats.mem_ntopng_virtual ~= nil)) then + ts_utils.append("process:resident_memory", { + ifid = getSystemInterfaceId(), + resident_bytes = system_host_stats.mem_ntopng_resident * 1024, + }, when, verbose) + end +end + +-- ##################################### diff --git a/scripts/lua/get_active_monitoring_hosts.lua b/scripts/lua/get_active_monitoring_hosts.lua index aeecb61184..dc4e56f511 100644 --- a/scripts/lua/get_active_monitoring_hosts.lua +++ b/scripts/lua/get_active_monitoring_hosts.lua @@ -38,7 +38,7 @@ for key, am_host in pairs(am_hosts) do end if charts_available then - chart = plugins_utils.getActiveMonitoringUrl('active_monitoring_stats.lua') .. '?am_host='.. am_host.host ..'&measurement='.. am_host.measurement ..'&page=historical' + chart = plugins_utils.getMonitorUrl('active_monitoring_monitor.lua') .. '?am_host='.. am_host.host ..'&measurement='.. am_host.measurement ..'&page=historical' end local column_last_ip = "" diff --git a/scripts/lua/host_details.lua b/scripts/lua/host_details.lua index 3fafa1b4ed..63d6b34384 100644 --- a/scripts/lua/host_details.lua +++ b/scripts/lua/host_details.lua @@ -750,7 +750,7 @@ else print([[ - ]].. last_rtt ..[[ + ]].. last_rtt ..[[ ]]) diff --git a/scripts/lua/inc/footer.lua b/scripts/lua/inc/footer.lua index 99e29a1b55..b58e992d15 100644 --- a/scripts/lua/inc/footer.lua +++ b/scripts/lua/inc/footer.lua @@ -357,7 +357,7 @@ print[[ } if(rsp.ts_alerts && rsp.ts_alerts.influxdb && (!systemInterfaceEnabled)) { - msg += "" + msg += "" msg += ""; } diff --git a/scripts/lua/inc/menu.lua b/scripts/lua/inc/menu.lua index 4863b42509..c30a22e881 100644 --- a/scripts/lua/inc/menu.lua +++ b/scripts/lua/inc/menu.lua @@ -23,7 +23,6 @@ local auth = require "auth" local blog_utils = require("blog_utils") local template_utils = require "template_utils" local auth = require "auth" -local template_utils = require("template_utils") local is_nedge = ntop.isnEdge() local is_appliance = ntop.isAppliance() local is_admin = isAdministrator() @@ -32,6 +31,7 @@ local info = ntop.getInfo() local has_local_auth = (ntop.getPref("ntopng.prefs.local.auth_enabled") ~= '0') local is_system_interface = page_utils.is_system_view() local behavior_utils = require("behavior_utils") +local checks = require "checks" local observationPointId = nil @@ -107,9 +107,6 @@ print[[ } ]] -local template = require "template_utils" - - prefs = ntop.getPrefs() local iface_names = interface.getIfNames() @@ -127,6 +124,7 @@ local ifs = interface.getStats() local is_pcap_dump = interface.isPcapDumpInterface() local is_packet_interface = interface.isPacketInterface() local is_viewed = ifs.isViewed +local is_influxdb_enabled = false ifId = ifs.id -- NOTE: see sidebar.js for the client logic @@ -152,8 +150,8 @@ else }, { entry = page_utils.menu_entries.active_monitoring, - url = "/lua/active_monitoring_stats.lua" - }, + url = "/lua/monitor/active_monitoring_monitor.lua" + }, { entry = page_utils.menu_entries.divider, hidden = not ntop.isEnterpriseM(), @@ -400,6 +398,16 @@ local health_entries = { entry = page_utils.menu_entries.alerts_status, url = '/lua/system_alerts_stats.lua', }, + { + entry = page_utils.menu_entries.influxdb_status, + url = '/lua/monitor/influxdb_monitor.lua', + hidden = not is_influxdb_enabled, + }, + { + entry = page_utils.menu_entries.redis_status, + url = '/lua/monitor/redis_monitor.lua', + hidden = false, -- TODO: add a check for redis monitoring status + } } -- Add plugin entries relative to system health (e.g., redis) ... @@ -437,7 +445,7 @@ local poller_entries = { { entry = page_utils.menu_entries.active_monitoring, hidden = not is_system_interface, - url = "/lua/active_monitoring_stats.lua", + url = "/lua/monitor/active_monitoring_monitor.lua", } } @@ -741,7 +749,6 @@ page_utils.add_menubar_section( } ) - -- ############################################## page_utils.print_menubar() @@ -970,7 +977,7 @@ print([[ if (not is_system_interface) then print("
  • ") print( - template.gen("typeahead_input.html", { + template_utils.gen("typeahead_input.html", { typeahead={ base_id = "host_search", action = "", -- see makeFindHostBeforeSubmitCallback diff --git a/scripts/lua/modules/alert_utils.lua b/scripts/lua/modules/alert_utils.lua index dd8bda8a6e..63e7c60b0c 100644 --- a/scripts/lua/modules/alert_utils.lua +++ b/scripts/lua/modules/alert_utils.lua @@ -370,7 +370,7 @@ function alert_utils.getConfigsetAlertLink(alert_json, alert --[[ optional --]]) local host = json.decode(alert.json)["host"] if host and host.measurement and not host.is_infrastructure then - return ' ' end end diff --git a/scripts/lua/modules/cpu_utils.lua b/scripts/lua/modules/cpu_utils.lua index 8641c7c1ca..db92489c9c 100644 --- a/scripts/lua/modules/cpu_utils.lua +++ b/scripts/lua/modules/cpu_utils.lua @@ -150,5 +150,11 @@ end -- ################################# +function cpu_utils.processTimeseriesEnabled() + return(ntop.getPref("ntopng.prefs.system_probes_timeseries") ~= "0") +end + +-- ################################# + return cpu_utils diff --git a/scripts/lua/modules/influxdb_export_api.lua b/scripts/lua/modules/influxdb_export_api.lua new file mode 100644 index 0000000000..5f03dd77a3 --- /dev/null +++ b/scripts/lua/modules/influxdb_export_api.lua @@ -0,0 +1,81 @@ +-- +-- (C) 2019-22 - ntop.org +-- + +local dirs = ntop.getDirs() +package.path = dirs.installdir .. "/scripts/lua/modules/timeseries/?.lua;" .. package.path + +local ts_utils_core = require("ts_utils_core") + +local influxdb_export_api = {} + +-- ############################################## + +function influxdb_export_api.isInfluxdbEnabled() + return ts_utils_core.getDriverName() == "influxdb" +end + +-- ############################################## + +function influxdb_export_api.isInfluxdbChecksEnabled() + return true -- TODO: Check if influxdb checks are enabled +end + +-- ############################################## + +function influxdb_export_api.getExportStats() + local points_exported + local points_dropped + local exports + local ifnames = interface.getIfNames() + + local influxdb = ts_utils_core.getQueryDriver() + + points_exported = influxdb:get_exported_points() + exports = influxdb:get_exports() + + local res = { + health = influxdb:get_health(), + points_exported = points_exported, + exports = exports, + } + + return(res) +end + +-- ############################################## + +function influxdb_export_api.measureRtt(when, influxdb) + local start_ms = ntop.gettimemsec() + local res = influxdb:getInfluxdbVersion() + local ifid = getSystemInterfaceId() + + if res ~= nil then + local end_ms = ntop.gettimemsec() + + ts_utils_core.append("influxdb:rtt", { ifid = ifid, millis_rtt = ((end_ms-start_ms)*1000) }, when) + end +end + +-- ############################################## + +function influxdb_export_api.exportStats(when, influxdb) + local stats = influxdb_export_api.getExportStats() + local ifid = getSystemInterfaceId() + + ts_utils_core.append("influxdb:exported_points", { ifid = ifid, points = stats.points_exported }, when) + ts_utils_core.append("influxdb:exports", { ifid = ifid, num_exports = stats.exports }, when) +end + +-- ############################################## + +function influxdb_export_api.exportStorageSize(when, influxdb) + local disk_bytes = influxdb:getDiskUsage() + local ifid = getSystemInterfaceId() + + if(disk_bytes ~= nil) then + ts_utils_core.append("influxdb:storage_size", { ifid = ifid, disk_bytes = disk_bytes }, when) + end +end + +return influxdb_export_api diff --git a/scripts/lua/modules/page_utils.lua b/scripts/lua/modules/page_utils.lua index f698b6c855..2d5d827e48 100644 --- a/scripts/lua/modules/page_utils.lua +++ b/scripts/lua/modules/page_utils.lua @@ -96,7 +96,8 @@ page_utils.menu_entries = { system_status = {key = "system_status", i18n_title = "system_status", section = "health"}, interfaces_status = {key = "interfaces_status", i18n_title = "system_interfaces_status", section = "health"}, alerts_status = {key = "alerts_status", i18n_title = "system_alerts_status", section = "health"}, - + influxdb_status = {key = "influxdb", i18n_title = "InfluxDB", section = "health"}, + redis_status = {key = "redis_monitor", i18n_title = "Redis", section = "health"}, -- exporters event_exporters = {key = "event_exporters", i18n_title = "event_exporters.event_exporters", section = "collection"}, sflow_exporters = {key = "sflow_exporters", i18n_title = "flows_page.sflow_devices", section = "collection"}, diff --git a/scripts/lua/modules/plugins_utils.lua b/scripts/lua/modules/plugins_utils.lua index 2c88e783ec..b2e21962dc 100644 --- a/scripts/lua/modules/plugins_utils.lua +++ b/scripts/lua/modules/plugins_utils.lua @@ -760,8 +760,8 @@ end -- ############################################## -function plugins_utils.getActiveMonitoringUrl(script) - return(ntop.getHttpPrefix() .. "/lua/" .. script) +function plugins_utils.getMonitorUrl(script) + return(ntop.getHttpPrefix() .. "/lua/monitor/" .. script) end -- ############################################## diff --git a/scripts/lua/modules/redis_api.lua b/scripts/lua/modules/redis_api.lua new file mode 100644 index 0000000000..ce1a993876 --- /dev/null +++ b/scripts/lua/modules/redis_api.lua @@ -0,0 +1,90 @@ +-- +-- (C) 2019-21 - ntop.org +-- + +local redis_api = {} + +-- ############################################## + +local function getRedisStatus() + local redis = ntop.getCacheStatus() + local redis_info = redis["info"] + local res = {} + + for _, k in pairs(redis_info:split("\r\n")) do + local k = k:split(":") + + if k then + local v_k = k[1] + local v = tonumber(k[2]) or k[2] + + res[v_k] = v + end + end + + + if redis["dbsize"] then + res["dbsize"] = redis["dbsize"] + end + + return res +end + + -- ############################################## + +local function getHealth(redis_status) + local health = "green" + + if ntop.isWindows() then + -- See Windows note in script.getStats() + return health + end + + if redis_status["aof_enabled"] and redis_status["aof_enabled"] ~= 0 then + -- If here the use of Redis Append Only File (AOF) is enabled + -- so we should check for its errors + if redis_status["aof_last_bgrewrite_status"] ~= "ok" or redis_status["aof_last_write_status"] ~= "ok" then + health = "red" + end + end + + if redis_status["rdb_last_bgsave_status"] ~= "ok" then + health = "red" + end + + return health +end + +-- ############################################## + +-- NOTE: on Windows, some stats are missing from script.getRedisStatus(): +-- - aof_last_bgrewrite_status +-- - aof_last_write_status +-- - rdb_last_bgsave_status +-- - dbsize +function redis_api.getStats() + local redis_status = getRedisStatus() + + local res = { + -- used_memory_rss: Number of bytes that Redis allocated + -- as seen by the operating system (a.k.a resident set size). + -- This is the number reported by tools such as top(1) and ps(1) + memory = redis_status["used_memory_rss"], + -- The number of keys in the database + dbsize = redis_status["dbsize"], + -- Health + health = getHealth(redis_status) + } + + return res +end + +-- ############################################### + +function redis_api.redisTimeseriesEnabled() + return(ntop.getPref("ntopng.prefs.system_probes_timeseries") ~= "0") +end + +-- ############################################### + +return redis_api diff --git a/scripts/lua/modules/timeseries/schemas/ts_5min.lua b/scripts/lua/modules/timeseries/schemas/ts_5min.lua index 5ed0943e4b..55a5a0392b 100644 --- a/scripts/lua/modules/timeseries/schemas/ts_5min.lua +++ b/scripts/lua/modules/timeseries/schemas/ts_5min.lua @@ -635,6 +635,12 @@ schema:addMetric("value") -- ############################################## +------------------------------------------------------- +-- INFLUXDB SCHEMAS +------------------------------------------------------- + +-- ############################################## + schema = ts_utils.newSchema("am_host:http_stats_5mins", { step = 300, metrics_type = ts_utils.metrics.gauge, aggregation_function = ts_utils.aggregation.max, is_system_schema = true }) schema:addTag("ifid") schema:addTag("host") @@ -666,6 +672,53 @@ schema:addTag("ifid") schema:addTag("host") schema:addMetric("latency") +------------------------------------------------------- +-- INFLUXDB SCHEMAS +------------------------------------------------------- + +-- ############################################## + +schema = ts_utils.newSchema("influxdb:storage_size", { metrics_type = ts_utils.metrics.gauge, is_system_schema = true, step = 300 }) +schema:addTag("ifid") +schema:addMetric("disk_bytes") + +-- ############################################## + +schema = ts_utils.newSchema("influxdb:exported_points", { metrics_type = ts_utils.metrics.counter, is_system_schema = true, step = 300 }) +schema:addTag("ifid") +schema:addMetric("points") + +-- ############################################## + +schema = ts_utils.newSchema("influxdb:dropped_points", { metrics_type = ts_utils.metrics.counter, is_system_schema = true, step = 300 }) +schema:addTag("ifid") +schema:addMetric("points") + +-- ############################################## + +schema = ts_utils.newSchema("influxdb:exports", { metrics_type = ts_utils.metrics.counter, is_system_schema = true, step = 300 }) +schema:addTag("ifid") +schema:addMetric("num_exports") + +-- ############################################## + +schema = ts_utils.newSchema("influxdb:rtt", { metrics_type = ts_utils.metrics.gauge, is_system_schema = true, step = 300 }) +schema:addTag("ifid") +schema:addMetric("millis_rtt") + +-- ############################################## + +-- The following metrics are built-in into influxdb +schema = ts_utils.newSchema("influxdb:memory_size", { influx_internal_query = ts_utils.get_memory_size_query, is_system_schema = true, metrics_type = ts_utils.metrics.gauge, step = 10 }) +schema:addTag("ifid") +schema:addMetric("mem_bytes") + +-- ############################################## + +schema = ts_utils.newSchema("influxdb:write_successes", { influx_internal_query = ts_utils.get_write_success_query, is_system_schema = true, metrics_type = ts_utils.metrics.counter, step = 10 }) +schema:addTag("ifid") +schema:addMetric("points") + ------------------------------------------------------- -- PRO VERSION SCHEMAS ------------------------------------------------------- diff --git a/scripts/lua/modules/timeseries/schemas/ts_minute.lua b/scripts/lua/modules/timeseries/schemas/ts_minute.lua index 259e59e776..c90b9aff6b 100644 --- a/scripts/lua/modules/timeseries/schemas/ts_minute.lua +++ b/scripts/lua/modules/timeseries/schemas/ts_minute.lua @@ -52,6 +52,24 @@ schema:addTag("hash_table") schema:addMetric("num_idle") schema:addMetric("num_active") +------------------------------------------------------- +-- MEMORY AND ALERT SCHEMAS ('/callbacks/minute/system/timeseries.lua') +------------------------------------------------------- + +-- ################################################ + +schema = ts_utils.newSchema("process:resident_memory", { step=60, metrics_type=ts_utils.metrics.gauge, is_critical_ts=true }) +schema:addTag("ifid") +schema:addMetric("resident_bytes") + +-- ################################################ + +schema = ts_utils.newSchema("process:num_alerts", { step = 60 }) +schema:addTag("ifid") +schema:addMetric("written_alerts") +schema:addMetric("alerts_queries") +schema:addMetric("dropped_alerts") + ------------------------------------------------------- -- PROFILES SCHEMAS ------------------------------------------------------- @@ -450,3 +468,27 @@ schema:addTag("ifid") schema:addTag("pod") schema:addMetric("as_client") schema:addMetric("as_server") + +-- ################################################ + +------------------------------------------------------- +-- REDIS SCHEMAS +------------------------------------------------------- + +schema = ts_utils.newSchema("redis:memory", { metrics_type = ts_utils.metrics.gauge, is_system_schema = true, step = 60 }) +schema:addTag("ifid") +schema:addMetric("resident_bytes") + +-- ################################################ + +schema = ts_utils.newSchema("redis:keys", { metrics_type = ts_utils.metrics.gauge, is_system_schema = true, step = 60 }) +schema:addTag("ifid") +schema:addMetric("num_keys") + +-- ################################################ + +-- Cache +schema = ts_utils.newSchema("redis:hits", { metrics_type = ts_utils.metrics.gauge, is_system_schema = true, step = 60 }) +schema:addTag("ifid") +schema:addTag("command") +schema:addMetric("num_calls") diff --git a/scripts/lua/modules/timeseries/ts_utils_core.lua b/scripts/lua/modules/timeseries/ts_utils_core.lua index e502e8adaa..e1ec9e8df5 100644 --- a/scripts/lua/modules/timeseries/ts_utils_core.lua +++ b/scripts/lua/modules/timeseries/ts_utils_core.lua @@ -885,4 +885,33 @@ end -- ############################################## +function ts_utils.get_memory_size_query(influxdb, schema, tstart, tend, time_step) + --[[ + See comments in function driver:getMemoryUsage() to understand + why it is necessary to subtract the HeapReleased from Sys. + --]] + local q = 'SELECT MEAN(Sys) - MEAN(HeapReleased) as mem_bytes' .. + ' FROM "_internal".."runtime"' .. + " WHERE time >= " .. tstart .. "000000000 AND time <= " .. tend .. "000000000" .. + " GROUP BY TIME(".. time_step .."s)" + + return(q) +end + +-- ############################################## + +function ts_utils.get_write_success_query(influxdb, schema, tstart, tend, time_step) + local q = 'SELECT SUM(writePointsOk) as points' .. + ' FROM (SELECT '.. + ' (DERIVATIVE(MEAN(writePointsOk)) / '.. time_step ..') as writePointsOk' .. + ' FROM "monitor"."shard" WHERE "database"=\''.. influxdb.db ..'\'' .. + " AND time >= " .. tstart .. "000000000 AND time <= " .. tend .. "000000000" .. + " GROUP BY id)" .. + " GROUP BY TIME(".. time_step .."s)" + + return(q) +end + +-- ############################################## + return ts_utils diff --git a/scripts/lua/active_monitoring_stats.lua b/scripts/lua/monitor/active_monitoring_monitor.lua similarity index 97% rename from scripts/lua/active_monitoring_stats.lua rename to scripts/lua/monitor/active_monitoring_monitor.lua index 0bb5a6aac6..854118edf1 100644 --- a/scripts/lua/active_monitoring_stats.lua +++ b/scripts/lua/monitor/active_monitoring_monitor.lua @@ -35,7 +35,7 @@ local host = _GET["am_host"] local page = _GET["page"] or ('overview') local measurement = _GET["measurement"] -local base_url = plugins_utils.getUrl("active_monitoring_stats.lua") .. "?ifid=" .. getInterfaceId(ifname) +local base_url = plugins_utils.getUrl("active_monitoring_monitor.lua") .. "?ifid=" .. getInterfaceId(ifname) local url = base_url local info = ntop.getInfo() local measurement_info @@ -67,7 +67,7 @@ if auth.has_capability(auth.capabilities.active_monitoring) then end -local navbar_title = ui_utils.create_navbar_title(title, host_label, "/lua/active_monitoring_stats.lua") +local navbar_title = ui_utils.create_navbar_title(title, host_label, "/lua/monitor/active_monitoring_monitor.lua") page_utils.print_navbar(navbar_title, url, { { diff --git a/scripts/plugins/monitors/system/influxdb_monitor/web_gui/influxdb_stats.lua b/scripts/lua/monitor/influxdb_monitor.lua similarity index 96% rename from scripts/plugins/monitors/system/influxdb_monitor/web_gui/influxdb_stats.lua rename to scripts/lua/monitor/influxdb_monitor.lua index 6960190c5d..ae23236986 100644 --- a/scripts/plugins/monitors/system/influxdb_monitor/web_gui/influxdb_stats.lua +++ b/scripts/lua/monitor/influxdb_monitor.lua @@ -13,14 +13,12 @@ local alert_consts = require("alert_consts") local checks = require("checks") local plugins_utils = require("plugins_utils") local graph_utils = require("graph_utils") -local alert_utils = require("alert_utils") - -local probe = checks.loadModule(getSystemInterfaceId(), checks.script_types.system, "system", "influxdb_monitor") +local alert_utils = require "alert_utils" +local influxdb_export_api = require "influxdb_export_api" sendHTTPContentTypeHeader('text/html') - -page_utils.set_active_menu_entry(page_utils.menu_entries.influxdb) +page_utils.set_active_menu_entry(page_utils.menu_entries.influxdb_status) dofile(dirs.installdir .. "/scripts/lua/inc/menu.lua") @@ -33,7 +31,7 @@ if not isAllowedSystemInterface() or (ts_utils.getDriverName() ~= "influxdb") th end local page = _GET["page"] or "overview" -local url = plugins_utils.getUrl("influxdb_stats.lua") .. "?ifid=" .. interface.getId() +local url = plugins_utils.getMonitorUrl("influxdb_monitor.lua") .. "?ifid=" .. interface.getId() local title = "InfluxDB" page_utils.print_navbar(title, url, @@ -71,8 +69,8 @@ if(page == "overview") then print(ternary(charts_available, "", "")) print(" \n") - if(probe ~= nil) then - local stats = probe.getExportStats() + if(influxdb_export_api.isInfluxdbChecksEnabled() == true) then + local stats = influxdb_export_api.getExportStats() print("".. i18n("system_stats.exports") .."
    "..i18n("system_stats.short_desc_influxdb_exports").."") print("") diff --git a/scripts/plugins/monitors/system/redis_monitor/web_gui/redis_stats.lua b/scripts/lua/monitor/redis_monitor.lua similarity index 95% rename from scripts/plugins/monitors/system/redis_monitor/web_gui/redis_stats.lua rename to scripts/lua/monitor/redis_monitor.lua index ea8c50046c..6e0f6a93de 100644 --- a/scripts/plugins/monitors/system/redis_monitor/web_gui/redis_stats.lua +++ b/scripts/lua/monitor/redis_monitor.lua @@ -27,7 +27,7 @@ page_utils.set_active_menu_entry(page_utils.menu_entries.redis_monitor) dofile(dirs.installdir .. "/scripts/lua/inc/menu.lua") local page = _GET["page"] or "overview" -local url = plugins_utils.getUrl("redis_stats.lua") .. "?ifid=" .. getInterfaceId(ifname) +local url = plugins_utils.getMonitorUrl("redis_monitor.lua") .. "?ifid=" .. getInterfaceId(ifname) page_utils.print_navbar("Redis", url, { @@ -85,9 +85,11 @@ if(page == "overview") then }; function refreshRedisStats() { - $.get("]] print(plugins_utils.getUrl("get_redis_info.lua")) print[[", function(info) { + $.get("]] print(ntop.getHttpPrefix()) print[[/lua/rest/v2/get/redis/redis_info.lua", function(info) { $(".redis-info-load").hide(); + info = info.rsp; + if(typeof info.health !== "undefined" && health_descr[info.health]) { $("#redis-health").html(health_descr[info.health]["status"] + "
    " + health_descr[info.health]["descr"]); } @@ -123,7 +125,7 @@ $("#table-redis-stats").datatable({ title: "", perPage: 100, hidePerPage: true, - url: "]] print(plugins_utils.getUrl("get_redis_stats.lua")) print(ntop.getHttpPrefix()) print[[", + url: "]] print(ntop.getHttpPrefix()) print("/lua/rest/v2/get/redis/redis_stats.lua") print[[", columns: [ { field: "column_key", diff --git a/scripts/lua/rest/v2/get/redis/redis_info.lua b/scripts/lua/rest/v2/get/redis/redis_info.lua new file mode 100644 index 0000000000..9f3a41231c --- /dev/null +++ b/scripts/lua/rest/v2/get/redis/redis_info.lua @@ -0,0 +1,13 @@ +-- +-- (C) 2019-22 - ntop.org +-- + +local dirs = ntop.getDirs() +package.path = dirs.installdir .. "/scripts/lua/modules/?.lua;" .. package.path + +local redis_api = require "redis_api" +local rest_utils = require("rest_utils") + +local stats = redis_api.getStats() + +rest_utils.answer(rest_utils.consts.success.ok, stats) diff --git a/scripts/plugins/monitors/system/redis_monitor/web_gui/get_redis_stats.lua b/scripts/lua/rest/v2/get/redis/redis_stats.lua similarity index 95% rename from scripts/plugins/monitors/system/redis_monitor/web_gui/get_redis_stats.lua rename to scripts/lua/rest/v2/get/redis/redis_stats.lua index 0b18a38ff4..d30d0196c0 100644 --- a/scripts/plugins/monitors/system/redis_monitor/web_gui/get_redis_stats.lua +++ b/scripts/lua/rest/v2/get/redis/redis_stats.lua @@ -6,11 +6,8 @@ local dirs = ntop.getDirs() package.path = dirs.installdir .. "/scripts/lua/modules/?.lua;" .. package.path require "lua_utils" -local format_utils = require("format_utils") -local json = require("dkjson") local plugins_utils = require("plugins_utils") - -sendHTTPContentTypeHeader('application/json') +local rest_utils = require("rest_utils") -- ################################################ @@ -117,10 +114,11 @@ end -- ################################################ local result = {} + result["perPage"] = perPage result["currentPage"] = currentPage result["totalRows"] = totalRows result["data"] = res result["sort"] = {{sortColumn, sortOrder}} -print(json.encode(result)) +rest_utils.answer(rest_utils.consts.success.ok, result) diff --git a/scripts/plugins/monitors/system/disk_monitor/checks/system/disk_monitor.lua b/scripts/plugins/monitors/system/disk_monitor/checks/system/disk_monitor.lua deleted file mode 100644 index 7c56f3cfbe..0000000000 --- a/scripts/plugins/monitors/system/disk_monitor/checks/system/disk_monitor.lua +++ /dev/null @@ -1,41 +0,0 @@ --- --- (C) 2019-21 - ntop.org --- - -local ts_utils = require("ts_utils_core") -local checks = require("checks") -local ts_utils = require("ts_utils_core") -local storage_utils = require("storage_utils") -local alerts_api = require("alerts_api") - -local script = { - -- Script category - category = checks.check_categories.system, - - -- This module is enabled by default - default_enabled = true, - - -- No default configuration is provided - default_value = {}, - - -- See below - hooks = {}, - - gui = { - i18n_title = "system_stats.disk_monitor", - i18n_description = "system_stats.disk_monitor_description", - }, -} - --- ############################################## - --- Defines an hook which is executed every hour -function script.hooks.hour(params) - local info = storage_utils.storageInfo(true --[[ refresh cache ]], 120 --[[ Allow a couple of minutes --]]) - - -- TODO alert if free disk space is too low -end - --- ############################################## - -return(script) diff --git a/scripts/plugins/monitors/system/disk_monitor/manifest.lua b/scripts/plugins/monitors/system/disk_monitor/manifest.lua deleted file mode 100644 index a840ecbeb9..0000000000 --- a/scripts/plugins/monitors/system/disk_monitor/manifest.lua +++ /dev/null @@ -1,10 +0,0 @@ --- --- (C) 2019-22 - ntop.org --- - -return { - title = "Disk Monitor", - description = "Monitors storage free space", - author = "ntop", - dependencies = {}, -} diff --git a/scripts/plugins/monitors/system/influxdb_monitor/checks/system/influxdb_monitor.lua b/scripts/plugins/monitors/system/influxdb_monitor/checks/system/influxdb_monitor.lua deleted file mode 100644 index ae384966bf..0000000000 --- a/scripts/plugins/monitors/system/influxdb_monitor/checks/system/influxdb_monitor.lua +++ /dev/null @@ -1,130 +0,0 @@ --- --- (C) 2019-21 - ntop.org --- - -local checks = require("checks") -local ts_utils = require("ts_utils_core") -local alerts_api = require("alerts_api") -local alert_consts = require("alert_consts") - -local script = { - -- Script category - category = checks.check_categories.system, - - -- This module is enabled by default - default_enabled = true, - - -- No default configuration is provided - default_value = {}, - - gui = { - i18n_title = "alerts_dashboard.influxdb_monitor", - i18n_description = "alerts_dashboard.influxdb_monitor_description", - }, - - -- See below - hooks = {}, -} - --- ############################################## - -function script.setup() - -- Only enabled if InfluxDB is active - return(ts_utils.getDriverName() == "influxdb") -end - --- ############################################## - --- Defines an hook which is executed every 5 minutes -script.hooks["5mins"] = function(params) - if params.ts_enabled then - local influxdb = ts_utils.getQueryDriver() - local when = params.when - - script._exportStats(when, influxdb) - script._measureRtt(when, influxdb) - script._exportStorageSize(when, influxdb) - end -end - --- ############################################## - --- Defines an hook which is executed every minute -script.hooks["min"] = function(params) - local last_error = ntop.getCache("ntopng.cache.influxdb.last_error") - - -- Note: last_error is automatically cleared once the error is gone - if(not isEmptyString(last_error)) then - local influxdb = ts_utils.getQueryDriver() - - local alert_type = alert_consts.alert_types.alert_influxdb_error.new( - last_error - ) - - alert_type:set_score_error() - alert_type:set_granularity(alert_consts.alerts_granularities.min) - - alert_type:store(alerts_api.systemEntity()) - end -end - --- ############################################## - -function script.getExportStats() - local points_exported - local points_dropped - local exports - local ifnames = interface.getIfNames() - - local influxdb = ts_utils.getQueryDriver() - - points_exported = influxdb:get_exported_points() - exports = influxdb:get_exports() - - local res = { - health = influxdb:get_health(), - points_exported = points_exported, - exports = exports, - } - - return(res) -end - --- ############################################## - -function script._measureRtt(when, influxdb) - local start_ms = ntop.gettimemsec() - local res = influxdb:getInfluxdbVersion() - local ifid = getSystemInterfaceId() - - if res ~= nil then - local end_ms = ntop.gettimemsec() - - ts_utils.append("influxdb:rtt", {ifid = ifid, millis_rtt = ((end_ms-start_ms)*1000)}, when) - end -end - --- ############################################## - -function script._exportStats(when, influxdb) - local stats = script.getExportStats() - local ifid = getSystemInterfaceId() - - ts_utils.append("influxdb:exported_points", {ifid = ifid, points = stats.points_exported}, when) - ts_utils.append("influxdb:exports", {ifid = ifid, num_exports = stats.exports}, when) -end - --- ############################################## - -function script._exportStorageSize(when, influxdb) - local disk_bytes = influxdb:getDiskUsage() - local ifid = getSystemInterfaceId() - - if(disk_bytes ~= nil) then - ts_utils.append("influxdb:storage_size", {ifid = ifid, disk_bytes = disk_bytes}, when) - end -end - --- ############################################## - -return(script) diff --git a/scripts/plugins/monitors/system/influxdb_monitor/manifest.lua b/scripts/plugins/monitors/system/influxdb_monitor/manifest.lua deleted file mode 100644 index 9f52b1ff83..0000000000 --- a/scripts/plugins/monitors/system/influxdb_monitor/manifest.lua +++ /dev/null @@ -1,10 +0,0 @@ --- --- (C) 2019-22 - ntop.org --- - -return { - title = "InluxDB Monitor", - description = "Monitors the status of InfluxDB", - author = "ntop", - dependencies = {}, -} diff --git a/scripts/plugins/monitors/system/influxdb_monitor/ts_schemas/5mins.lua b/scripts/plugins/monitors/system/influxdb_monitor/ts_schemas/5mins.lua deleted file mode 100644 index 8342a579d0..0000000000 --- a/scripts/plugins/monitors/system/influxdb_monitor/ts_schemas/5mins.lua +++ /dev/null @@ -1,94 +0,0 @@ --- --- (C) 2019-22 - ntop.org --- - -local ts_utils = require "ts_utils_core" -local schema - --- ############################################## - -local function get_memory_size_query(influxdb, schema, tstart, tend, time_step) - --[[ - See comments in function driver:getMemoryUsage() to understand - why it is necessary to subtract the HeapReleased from Sys. - --]] - local q = 'SELECT MEAN(Sys) - MEAN(HeapReleased) as mem_bytes' .. - ' FROM "_internal".."runtime"' .. - " WHERE time >= " .. tstart .. "000000000 AND time <= " .. tend .. "000000000" .. - " GROUP BY TIME(".. time_step .."s)" - - return(q) -end - -local function get_write_success_query(influxdb, schema, tstart, tend, time_step) - local q = 'SELECT SUM(writePointsOk) as points' .. - ' FROM (SELECT '.. - ' (DERIVATIVE(MEAN(writePointsOk)) / '.. time_step ..') as writePointsOk' .. - ' FROM "monitor"."shard" WHERE "database"=\''.. influxdb.db ..'\'' .. - " AND time >= " .. tstart .. "000000000 AND time <= " .. tend .. "000000000" .. - " GROUP BY id)" .. - " GROUP BY TIME(".. time_step .."s)" - - return(q) -end - --- ############################################## - -schema = ts_utils.newSchema("influxdb:storage_size", { - metrics_type = ts_utils.metrics.gauge, - is_system_schema = true, - step = 300, -}) -schema:addTag("ifid") -schema:addMetric("disk_bytes") - -schema = ts_utils.newSchema("influxdb:exported_points", { - metrics_type = ts_utils.metrics.counter, - is_system_schema = true, - step = 300, -}) -schema:addTag("ifid") -schema:addMetric("points") - -schema = ts_utils.newSchema("influxdb:dropped_points", { - metrics_type = ts_utils.metrics.counter, - is_system_schema = true, - step = 300, -}) -schema:addTag("ifid") -schema:addMetric("points") - -schema = ts_utils.newSchema("influxdb:exports", { - metrics_type = ts_utils.metrics.counter, - is_system_schema = true, - step = 300, -}) -schema:addTag("ifid") -schema:addMetric("num_exports") - -schema = ts_utils.newSchema("influxdb:rtt", { - metrics_type = ts_utils.metrics.gauge, - is_system_schema = true, - step = 300, -}) -schema:addTag("ifid") -schema:addMetric("millis_rtt") - --- The following metrics are built-in into influxdb -schema = ts_utils.newSchema("influxdb:memory_size", { - influx_internal_query = get_memory_size_query, - is_system_schema = true, - metrics_type = ts_utils.metrics.gauge, - step = 10, -}) -schema:addTag("ifid") -schema:addMetric("mem_bytes") - -schema = ts_utils.newSchema("influxdb:write_successes", { - influx_internal_query = get_write_success_query, - is_system_schema = true, - metrics_type = ts_utils.metrics.counter, - step = 10, -}) -schema:addTag("ifid") -schema:addMetric("points") diff --git a/scripts/plugins/monitors/system/influxdb_monitor/web_gui/menu.lua b/scripts/plugins/monitors/system/influxdb_monitor/web_gui/menu.lua deleted file mode 100644 index 7b8a20393d..0000000000 --- a/scripts/plugins/monitors/system/influxdb_monitor/web_gui/menu.lua +++ /dev/null @@ -1,13 +0,0 @@ -return { - label = "InfluxDB", - script = "influxdb_stats.lua", - sort_order = 1600, - menu_entry = {key = "influxdb", i18n_title = "InfluxDB", section = "health"}, - is_shown = function() - local ts_utils = require("ts_utils_core") - local checks = require("checks") - - return((ts_utils.getDriverName() == "influxdb") and - checks.isSystemScriptEnabled("influxdb_monitor")) - end -} diff --git a/scripts/plugins/monitors/system/redis_monitor/checks/system/redis_monitor.lua b/scripts/plugins/monitors/system/redis_monitor/checks/system/redis_monitor.lua deleted file mode 100644 index e062b30ca6..0000000000 --- a/scripts/plugins/monitors/system/redis_monitor/checks/system/redis_monitor.lua +++ /dev/null @@ -1,144 +0,0 @@ --- --- (C) 2019-21 - ntop.org --- - -local ts_utils = require("ts_utils_core") -local checks = require("checks") - -local script = { - -- Script category - category = checks.check_categories.system, - - -- This module is enabled by default - default_enabled = true, - - -- No default configuration is provided - default_value = {}, - - -- See below - hooks = {}, - - gui = { - i18n_title = "system_stats.redis.redis_monitor", - i18n_description = "system_stats.redis.redis_monitor_description", - }, -} - --- ############################################## - --- Defines an hook which is executed every minute -function script.hooks.min(params) - if params.ts_enabled then - local ifid = getSystemInterfaceId() - local stats = script.getStats() - local hits_key = "ntopng.cache.redis.stats" - local json = require("dkjson") - local hits_stats = ntop.getCacheStats() - - local old_hits_stats = ntop.getCache(hits_key) - - if(not isEmptyString(old_hits_stats)) then - old_hits_stats = json.decode(old_hits_stats) or {} - else - old_hits_stats = {} - end - - if stats["memory"] then - ts_utils.append("redis:memory", {ifid = ifid, resident_bytes = stats["memory"]}, when) - end - - if stats["dbsize"] then - ts_utils.append("redis:keys", {ifid = ifid, num_keys = stats["dbsize"]}, when) - end - - for key, val in pairs(hits_stats) do - if(old_hits_stats[key] ~= nil) then - local delta = math.max(val - old_hits_stats[key], 0) - - -- Dump the delta value as a gauge - ts_utils.append("redis:hits", {ifid = ifid, command = key, num_calls = delta}, when) - end - end - - ntop.setCache(hits_key, json.encode(hits_stats)) - end -end - --- ############################################## - -function script.getRedisStatus() - local redis = ntop.getCacheStatus() - local redis_info = redis["info"] - local res = {} - - for _, k in pairs(redis_info:split("\r\n")) do - local k = k:split(":") - - if k then - local v_k = k[1] - local v = tonumber(k[2]) or k[2] - - res[v_k] = v - end - end - - - if redis["dbsize"] then - res["dbsize"] = redis["dbsize"] - end - - return res -end - --- ############################################## - -local function getHealth(redis_status) - local health = "green" - - if ntop.isWindows() then - -- See Windows note in script.getStats() - return health - end - - if redis_status["aof_enabled"] and redis_status["aof_enabled"] ~= 0 then - -- If here the use of Redis Append Only File (AOF) is enabled - -- so we should check for its errors - if redis_status["aof_last_bgrewrite_status"] ~= "ok" or redis_status["aof_last_write_status"] ~= "ok" then - health = "red" - end - end - - if redis_status["rdb_last_bgsave_status"] ~= "ok" then - health = "red" - end - - return health -end - --- ############################################## - --- NOTE: on Windows, some stats are missing from script.getRedisStatus(): --- - aof_last_bgrewrite_status --- - aof_last_write_status --- - rdb_last_bgsave_status --- - dbsize -function script.getStats() - local redis_status = script.getRedisStatus() - - local res = { - -- used_memory_rss: Number of bytes that Redis allocated - -- as seen by the operating system (a.k.a resident set size). - -- This is the number reported by tools such as top(1) and ps(1) - memory = redis_status["used_memory_rss"], - -- The number of keys in the database - dbsize = redis_status["dbsize"], - -- Health - health = getHealth(redis_status) - } - - return res -end - --- ############################################## - -return(script) diff --git a/scripts/plugins/monitors/system/redis_monitor/manifest.lua b/scripts/plugins/monitors/system/redis_monitor/manifest.lua deleted file mode 100644 index c96f30e691..0000000000 --- a/scripts/plugins/monitors/system/redis_monitor/manifest.lua +++ /dev/null @@ -1,10 +0,0 @@ --- --- (C) 2019-22 - ntop.org --- - -return { - title = "Redis Monitor", - description = "Monitors Redis health and performance", - author = "ntop", - dependencies = {}, -} diff --git a/scripts/plugins/monitors/system/redis_monitor/ts_schemas/min.lua b/scripts/plugins/monitors/system/redis_monitor/ts_schemas/min.lua deleted file mode 100644 index 4e7829789e..0000000000 --- a/scripts/plugins/monitors/system/redis_monitor/ts_schemas/min.lua +++ /dev/null @@ -1,28 +0,0 @@ -local schema -local ts_utils = require("ts_utils_core") - -schema = ts_utils.newSchema("redis:memory", { - metrics_type = ts_utils.metrics.gauge, - is_system_schema = true, - step = 60, -}) -schema:addTag("ifid") -schema:addMetric("resident_bytes") - -schema = ts_utils.newSchema("redis:keys", { - metrics_type = ts_utils.metrics.gauge, - is_system_schema = true, - step = 60, -}) -schema:addTag("ifid") -schema:addMetric("num_keys") - --- Cache -schema = ts_utils.newSchema("redis:hits", { - metrics_type = ts_utils.metrics.gauge, - is_system_schema = true, - step = 60, -}) -schema:addTag("ifid") -schema:addTag("command") -schema:addMetric("num_calls") diff --git a/scripts/plugins/monitors/system/redis_monitor/web_gui/get_redis_info.lua b/scripts/plugins/monitors/system/redis_monitor/web_gui/get_redis_info.lua deleted file mode 100644 index 3bc33b6a21..0000000000 --- a/scripts/plugins/monitors/system/redis_monitor/web_gui/get_redis_info.lua +++ /dev/null @@ -1,18 +0,0 @@ --- --- (C) 2019-22 - ntop.org --- - -local dirs = ntop.getDirs() -package.path = dirs.installdir .. "/scripts/lua/modules/?.lua;" .. package.path - -require "lua_utils" -local checks = require("checks") -local json = require "dkjson" - -local redis = checks.loadModule(getSystemInterfaceId(), checks.script_types.system, "system", "redis_monitor") - -sendHTTPContentTypeHeader('application/json') - -local stats = redis.getStats() - -print(json.encode(stats)) diff --git a/scripts/plugins/monitors/system/redis_monitor/web_gui/menu.lua b/scripts/plugins/monitors/system/redis_monitor/web_gui/menu.lua deleted file mode 100644 index 99754fed85..0000000000 --- a/scripts/plugins/monitors/system/redis_monitor/web_gui/menu.lua +++ /dev/null @@ -1,12 +0,0 @@ -return { - label = "Redis", - script = "redis_stats.lua", - sort_order = 1700, - menu_entry = {key = "redis_monitor", i18n_title = "Redis", section = "health"}, - - is_shown = function() - local checks = require("checks") - - return(checks.isSystemScriptEnabled("redis_monitor")) - end -} diff --git a/scripts/plugins/monitors/system/timeseries/checks/system/alerts_ts.lua b/scripts/plugins/monitors/system/timeseries/checks/system/alerts_ts.lua deleted file mode 100644 index c26a443b7b..0000000000 --- a/scripts/plugins/monitors/system/timeseries/checks/system/alerts_ts.lua +++ /dev/null @@ -1,46 +0,0 @@ --- --- (C) 2019-21 - ntop.org --- - -local ts_utils = require("ts_utils_core") -local checks = require("checks") -local cpu_utils = require("cpu_utils") - -local script = { - -- Script category - category = checks.check_categories.system, - - -- This module is enabled by default - default_enabled = true, - - -- No default configuration is provided - default_value = {}, - - -- See below - hooks = {}, - - gui = { - i18n_title = "alerts_dashboard.alerts_ts", - i18n_description = "alerts_dashboard.alerts_ts_description", - }, -} - --- ############################################## - -function script.hooks.min(params) - if params.ts_enabled then - local system_host_stats = cpu_utils.systemHostStats() - - ts_utils.append("process:num_alerts", - { - ifid = getSystemInterfaceId(), - dropped_alerts = system_host_stats.dropped_alerts or 0, - written_alerts = system_host_stats.written_alerts or 0, - alerts_queries = system_host_stats.alerts_queries or 0 - }, when, verbose) - end -end - --- ############################################## - -return script diff --git a/scripts/plugins/monitors/system/timeseries/checks/system/memory_ts.lua b/scripts/plugins/monitors/system/timeseries/checks/system/memory_ts.lua deleted file mode 100644 index 52fac124db..0000000000 --- a/scripts/plugins/monitors/system/timeseries/checks/system/memory_ts.lua +++ /dev/null @@ -1,47 +0,0 @@ --- --- (C) 2019-21 - ntop.org --- - -local ts_utils = require("ts_utils_core") -local checks = require("checks") -local cpu_utils = require("cpu_utils") - -local script = { - -- Script category - category = checks.check_categories.system, - - -- This module is enabled by default - default_enabled = true, - - -- No default configuration is provided - default_value = {}, - - -- See below - hooks = {}, - - gui = { - i18n_title = "alerts_dashboard.memory_ts", - i18n_description = "alerts_dashboard.memory_ts_description", - }, -} - --- ############################################## - -function script.hooks.min(params) - if params.ts_enabled then - local system_host_stats = cpu_utils.systemHostStats() - - if((system_host_stats.mem_ntopng_resident ~= nil) and - (system_host_stats.mem_ntopng_virtual ~= nil)) then - ts_utils.append("process:resident_memory", - { - ifid = getSystemInterfaceId(), - resident_bytes = system_host_stats.mem_ntopng_resident * 1024, - }, when, verbose) - end - end -end - --- ############################################## - -return script diff --git a/scripts/plugins/monitors/system/timeseries/manifest.lua b/scripts/plugins/monitors/system/timeseries/manifest.lua deleted file mode 100644 index dc3517b4b3..0000000000 --- a/scripts/plugins/monitors/system/timeseries/manifest.lua +++ /dev/null @@ -1,10 +0,0 @@ --- --- (C) 2019-22 - ntop.org --- - -return { - title = "Timeseries", - description = "Contains scripts executed periodically to dump timeseries", - author = "ntop", - dependencies = {}, -} diff --git a/scripts/plugins/monitors/system/timeseries/ts_schemas/min.lua b/scripts/plugins/monitors/system/timeseries/ts_schemas/min.lua deleted file mode 100644 index 182cb0befc..0000000000 --- a/scripts/plugins/monitors/system/timeseries/ts_schemas/min.lua +++ /dev/null @@ -1,19 +0,0 @@ --- --- (C) 2019-22 - ntop.org --- - -local ts_utils = require("ts_utils_core") - -schema = ts_utils.newSchema("process:resident_memory", {step=60, metrics_type=ts_utils.metrics.gauge, is_critical_ts=true}) -schema:addTag("ifid") -schema:addMetric("resident_bytes") - -------------------------------------------------------- --- ntopng process alerts -------------------------------------------------------- - -schema = ts_utils.newSchema("process:num_alerts", {step = 60}) -schema:addTag("ifid") -schema:addMetric("written_alerts") -schema:addMetric("alerts_queries") -schema:addMetric("dropped_alerts")