diff --git a/grafana/provisioning/dashboards/mikrotik/mikrotik_mktxp_exporter.json b/grafana/provisioning/dashboards/mikrotik/mikrotik_mktxp_exporter.json index 2ef3d04..49eaaf5 100644 --- a/grafana/provisioning/dashboards/mikrotik/mikrotik_mktxp_exporter.json +++ b/grafana/provisioning/dashboards/mikrotik/mikrotik_mktxp_exporter.json @@ -133,7 +133,7 @@ "textMode": "name", "wideLayout": true }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -213,7 +213,7 @@ "textMode": "name", "wideLayout": true }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -247,6 +247,9 @@ "type": "auto" }, "filterable": false, + "footer": { + "reducers": [] + }, "inspect": false }, "mappings": [], @@ -317,18 +320,10 @@ "id": 94, "options": { "cellHeight": "sm", - "footer": { - "countRows": false, - "fields": "", - "reducer": [ - "sum" - ], - "show": false - }, "showHeader": true, "sortBy": [] }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -455,7 +450,7 @@ "text": {}, "valueMode": "color" }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "application": { @@ -552,6 +547,7 @@ "type": "symlog" }, "showPoints": "never", + "showValues": false, "spanNulls": true, "stacking": { "group": "A", @@ -607,7 +603,7 @@ "sort": "none" } }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "application": { @@ -678,6 +674,7 @@ "type": "linear" }, "showPoints": "never", + "showValues": false, "spanNulls": true, "stacking": { "group": "A", @@ -801,7 +798,7 @@ "sort": "none" } }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "application": { @@ -885,7 +882,7 @@ "textMode": "value_and_name", "wideLayout": true }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -967,7 +964,7 @@ "sizing": "auto", "text": {} }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -1058,7 +1055,7 @@ "textMode": "name", "wideLayout": true }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "application": { @@ -1170,7 +1167,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "application": { @@ -1224,6 +1221,9 @@ "type": "auto" }, "filterable": false, + "footer": { + "reducers": [] + }, "inspect": false }, "mappings": [], @@ -1294,14 +1294,6 @@ "id": 98, "options": { "cellHeight": "sm", - "footer": { - "countRows": false, - "fields": "", - "reducer": [ - "sum" - ], - "show": false - }, "showHeader": true, "sortBy": [ { @@ -1310,7 +1302,7 @@ } ] }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -1397,6 +1389,7 @@ "type": "linear" }, "showPoints": "never", + "showValues": false, "spanNulls": true, "stacking": { "group": "A", @@ -1518,7 +1511,7 @@ "sort": "none" } }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "application": { @@ -1638,7 +1631,7 @@ "textMode": "value", "wideLayout": true }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "application": { @@ -1738,7 +1731,7 @@ "textMode": "name", "wideLayout": true }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -1818,7 +1811,7 @@ "textMode": "name", "wideLayout": true }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -1926,7 +1919,7 @@ "text": {}, "valueMode": "color" }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "application": { @@ -1980,6 +1973,9 @@ "type": "auto" }, "filterable": false, + "footer": { + "reducers": [] + }, "inspect": false }, "mappings": [], @@ -2081,14 +2077,6 @@ "id": 25, "options": { "cellHeight": "sm", - "footer": { - "countRows": false, - "fields": "", - "reducer": [ - "sum" - ], - "show": false - }, "showHeader": true, "sortBy": [ { @@ -2097,7 +2085,7 @@ } ] }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -2218,7 +2206,7 @@ "text": {}, "valueMode": "color" }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "application": { @@ -2320,7 +2308,7 @@ "text": {}, "valueMode": "color" }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "application": { @@ -2436,7 +2424,7 @@ "sizing": "auto", "text": {} }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -2512,7 +2500,7 @@ "text": {}, "valueMode": "color" }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "application": { @@ -2624,7 +2612,7 @@ "text": {}, "valueMode": "color" }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -2677,6 +2665,7 @@ "type": "linear" }, "showPoints": "never", + "showValues": false, "spanNulls": true, "stacking": { "group": "A", @@ -2741,7 +2730,7 @@ "sort": "none" } }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "application": { @@ -2868,7 +2857,7 @@ "text": {}, "valueMode": "color" }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -2900,6 +2889,9 @@ "type": "auto" }, "filterable": false, + "footer": { + "reducers": [] + }, "inspect": false }, "mappings": [], @@ -2929,17 +2921,9 @@ "id": 53, "options": { "cellHeight": "sm", - "footer": { - "countRows": false, - "fields": "", - "reducer": [ - "sum" - ], - "show": false - }, "showHeader": true }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -2998,6 +2982,9 @@ "type": "auto" }, "filterable": false, + "footer": { + "reducers": [] + }, "inspect": false }, "mappings": [], @@ -3098,14 +3085,6 @@ "id": 85, "options": { "cellHeight": "sm", - "footer": { - "countRows": false, - "fields": "", - "reducer": [ - "sum" - ], - "show": false - }, "showHeader": true, "sortBy": [ { @@ -3114,7 +3093,7 @@ } ] }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -3209,6 +3188,7 @@ "type": "linear" }, "showPoints": "never", + "showValues": false, "spanNulls": true, "stacking": { "group": "A", @@ -3295,7 +3275,7 @@ "sort": "desc" } }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "application": { @@ -3435,7 +3415,7 @@ "text": {}, "valueMode": "color" }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "application": { @@ -3530,7 +3510,7 @@ "text": {}, "valueMode": "color" }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "application": { @@ -3584,6 +3564,9 @@ "type": "auto" }, "filterable": false, + "footer": { + "reducers": [] + }, "inspect": false }, "mappings": [], @@ -3615,7 +3598,7 @@ }, { "id": "unit", - "value": "s" + "value": "dtdurationms" } ] }, @@ -3642,14 +3625,6 @@ "id": 127, "options": { "cellHeight": "sm", - "footer": { - "countRows": false, - "fields": "", - "reducer": [ - "sum" - ], - "show": false - }, "showHeader": true, "sortBy": [ { @@ -3658,7 +3633,7 @@ } ] }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -3735,6 +3710,9 @@ "type": "auto" }, "filterable": false, + "footer": { + "reducers": [] + }, "inspect": false }, "mappings": [], @@ -3817,15 +3795,7 @@ "id": 117, "options": { "cellHeight": "sm", - "footer": { - "countRows": false, - "enablePagination": false, - "fields": "", - "reducer": [ - "sum" - ], - "show": false - }, + "enablePagination": false, "showHeader": true, "sortBy": [ { @@ -3834,7 +3804,7 @@ } ] }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -3985,7 +3955,7 @@ "xTickLabelRotation": 0, "xTickLabelSpacing": 0 }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -4041,6 +4011,7 @@ "type": "log" }, "showPoints": "never", + "showValues": false, "spanNulls": true, "stacking": { "group": "A", @@ -4094,7 +4065,7 @@ "sort": "desc" } }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "application": { @@ -4168,6 +4139,7 @@ "type": "log" }, "showPoints": "never", + "showValues": false, "spanNulls": true, "stacking": { "group": "A", @@ -4221,7 +4193,7 @@ "sort": "desc" } }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "application": { @@ -4295,6 +4267,7 @@ "type": "log" }, "showPoints": "never", + "showValues": false, "spanNulls": true, "stacking": { "group": "A", @@ -4348,7 +4321,7 @@ "sort": "desc" } }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "application": { @@ -4422,6 +4395,7 @@ "type": "log" }, "showPoints": "never", + "showValues": false, "spanNulls": true, "stacking": { "group": "A", @@ -4475,7 +4449,7 @@ "sort": "desc" } }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "application": { @@ -4602,7 +4576,7 @@ "sort": "none" } }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "application": { @@ -4656,6 +4630,9 @@ "type": "color-text" }, "filterable": false, + "footer": { + "reducers": [] + }, "inspect": false }, "mappings": [], @@ -4723,18 +4700,10 @@ "id": 88, "options": { "cellHeight": "sm", - "footer": { - "countRows": false, - "fields": "", - "reducer": [ - "sum" - ], - "show": false - }, "showHeader": true, "sortBy": [] }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -6028,6 +5997,9 @@ "type": "auto" }, "filterable": false, + "footer": { + "reducers": [] + }, "inspect": false }, "decimals": 2, @@ -6095,18 +6067,10 @@ "id": 35, "options": { "cellHeight": "sm", - "footer": { - "countRows": false, - "fields": "", - "reducer": [ - "sum" - ], - "show": false - }, "showHeader": true, "sortBy": [] }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -6171,6 +6135,9 @@ "type": "auto" }, "filterable": false, + "footer": { + "reducers": [] + }, "inspect": false }, "mappings": [], @@ -6259,14 +6226,6 @@ "id": 41, "options": { "cellHeight": "sm", - "footer": { - "countRows": false, - "fields": "", - "reducer": [ - "sum" - ], - "show": false - }, "showHeader": true, "sortBy": [ { @@ -6275,7 +6234,7 @@ } ] }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -6393,7 +6352,7 @@ "text": {}, "valueMode": "color" }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "application": { @@ -6516,7 +6475,7 @@ "text": {}, "valueMode": "color" }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "application": { @@ -6588,6 +6547,7 @@ "type": "linear" }, "showPoints": "never", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -6641,7 +6601,7 @@ "sort": "desc" } }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "application": { @@ -6713,6 +6673,7 @@ "type": "linear" }, "showPoints": "never", + "showValues": false, "spanNulls": true, "stacking": { "group": "A", @@ -6799,7 +6760,7 @@ "sort": "desc" } }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "application": { @@ -8154,6 +8115,9 @@ "type": "auto" }, "filterable": false, + "footer": { + "reducers": [] + }, "inspect": false }, "mappings": [], @@ -8266,14 +8230,6 @@ "id": 121, "options": { "cellHeight": "sm", - "footer": { - "countRows": false, - "fields": "", - "reducer": [ - "sum" - ], - "show": false - }, "showHeader": true, "sortBy": [ { @@ -8282,7 +8238,7 @@ } ] }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -8377,6 +8333,7 @@ "type": "linear" }, "showPoints": "never", + "showValues": false, "spanNulls": true, "stacking": { "group": "A", @@ -8467,7 +8424,7 @@ "sort": "desc" } }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "application": { @@ -8611,7 +8568,7 @@ "sizing": "auto", "valueMode": "text" }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "application": { @@ -8683,6 +8640,7 @@ "type": "linear" }, "showPoints": "never", + "showValues": false, "spanNulls": true, "stacking": { "group": "A", @@ -8771,7 +8729,7 @@ "sort": "desc" } }, - "pluginVersion": "12.1.1", + "pluginVersion": "12.3.0", "targets": [ { "application": { @@ -8870,7 +8828,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": 0 }, { "color": "yellow", @@ -8899,6 +8858,12 @@ "id": 78, "options": { "displayMode": "gradient", + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": false + }, "maxVizHeight": 300, "minVizHeight": 10, "minVizWidth": 0, @@ -8916,7 +8881,7 @@ "text": {}, "valueMode": "color" }, - "pluginVersion": "11.0.0", + "pluginVersion": "12.3.0", "targets": [ { "application": { @@ -8971,6 +8936,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 30, "gradientMode": "none", @@ -8988,6 +8954,7 @@ "type": "log" }, "showPoints": "never", + "showValues": false, "spanNulls": true, "stacking": { "group": "A", @@ -9003,7 +8970,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": 0 }, { "color": "red", @@ -9032,12 +9000,13 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "maxHeight": 600, "mode": "multi", "sort": "desc" } }, - "pluginVersion": "9.3.2", + "pluginVersion": "12.3.0", "targets": [ { "application": { @@ -9104,6 +9073,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -9120,6 +9090,7 @@ "type": "linear" }, "showPoints": "never", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -9136,7 +9107,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": 0 }, { "color": "red", @@ -9168,12 +9140,13 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "maxHeight": 600, "mode": "multi", "sort": "none" } }, - "pluginVersion": "9.3.2", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -9207,6 +9180,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -9223,6 +9197,7 @@ "type": "linear" }, "showPoints": "never", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -9239,7 +9214,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": 0 }, { "color": "red", @@ -9271,12 +9247,13 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "maxHeight": 600, "mode": "multi", "sort": "none" } }, - "pluginVersion": "9.3.2", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -9296,7 +9273,7 @@ ], "preload": false, "refresh": "10s", - "schemaVersion": 41, + "schemaVersion": 42, "tags": [ "mikrotik", "mktxp" @@ -9305,8 +9282,8 @@ "list": [ { "current": { - "text": "MKT-GT-PD", - "value": "MKT-GT-PD" + "text": "MKT-GT", + "value": "MKT-GT" }, "datasource": { "type": "prometheus", @@ -9344,7 +9321,7 @@ }, "timepicker": {}, "timezone": "", - "title": "Mikrotik MKTXP Exporter Import", + "title": "Mikrotik MKTXP Exporter", "uid": "78d5fa8d-8a24-4a63-bfa7-802d55bb1638", "version": 1 } \ No newline at end of file diff --git a/mktxp/_mktxp.conf b/mktxp/_mktxp.conf index 8655203..0d322ef 100644 --- a/mktxp/_mktxp.conf +++ b/mktxp/_mktxp.conf @@ -14,20 +14,29 @@ [MKTXP] listen = '0.0.0.0:49090' # Space separated list of socket addresses to listen to, both IPV4 and IPV6 socket_timeout = 5 - + initial_delay_on_failure = 120 max_delay_on_failure = 900 delay_inc_div = 5 - bandwidth = False # Turns metrics bandwidth metrics collection on / off - bandwidth_test_interval = 600 # Interval for collecting bandwidth metrics - minimal_collect_interval = 5 # Minimal metric collection interval + bandwidth = False # Turns metrics bandwidth metrics collection on / off + bandwidth_test_dns_server = 8.8.8.8 # The DNS server to be used for the bandwidth test connectivity check + bandwidth_test_interval = 600 # Interval for collecting bandwidth metrics + minimal_collect_interval = 5 # Minimal metric collection interval verbose_mode = False # Set it on for troubleshooting - fetch_routers_in_parallel = False # Fetching metrics from multiple routers in parallel / sequentially + fetch_routers_in_parallel = False # Fetch metrics from multiple routers in parallel / sequentially max_worker_threads = 5 # Max number of worker threads that can fetch routers (parallel fetch only) max_scrape_duration = 30 # Max duration of individual routers' metrics collection (parallel fetch only) total_max_scrape_duration = 90 # Max overall duration of all metrics collection (parallel fetch only) + http_server_threads = 16 # Number of worker threads for the HTTP server - compact_default_conf_values = False # Compact mktxp.conf, so only specific values are kept on the individual routers' level \ No newline at end of file + persistent_router_connection_pool = True # Use a persistent router connections pool between scrapes + persistent_dhcp_cache = True # Persist DHCP cache between metric collections + compact_default_conf_values = False # Compact mktxp.conf, so only specific values are kept on the individual routers' level + prometheus_headers_deduplication = False # Deduplicate Prometheus HELP / TYPE headers in the metrics output + + probe_connection_pool = False # Enable probe-only connection reuse keyed by module+target + probe_connection_pool_ttl = 300 # Probe connection TTL in seconds + probe_connection_pool_max_size = 128 # Max number of probe connections to keep diff --git a/mktxp/mktxp.conf b/mktxp/mktxp.conf index 13dd498..273c0fa 100644 --- a/mktxp/mktxp.conf +++ b/mktxp/mktxp.conf @@ -19,13 +19,14 @@ # this affects configuration of all routers, unless overloaded on their specific levels enabled = True # turns metrics collection for this RouterOS device on / off + module_only = False # use this entry only as a probe module (skip /metrics collection) hostname = localhost # RouterOS IP address port = 8728 # RouterOS IP Port - + username = username # RouterOS user, needs to have 'read' and 'api' permissions password = password credentials_file = "" # To use an external file in YAML format for both username and password, specify the path here - + custom_labels = None # Custom labels to be injected to all device metrics, comma-separated key:value (or key=value) pairs use_ssl = False # enables connection via API-SSL servis @@ -41,10 +42,10 @@ dhcp_lease = True # DHCP lease metrics connections = True # IP connections metrics - connection_stats = False # Open IP connections metrics + connection_stats = False # Open IP connections metrics interface = True # Interfaces traffic metrics - + route = True # IPv4 Routes metrics pool = True # IPv4 Pool metrics firewall = True # IPv4 Firewall rules traffic metrics @@ -52,7 +53,7 @@ address_list = None # Firewall Address List metrics, a comma-separated list of names dns = False # DNS stats - ipv6_route = False # IPv6 Routes metrics + ipv6_route = False # IPv6 Routes metrics ipv6_pool = False # IPv6 Pool metrics ipv6_firewall = False # IPv6 Firewall rules traffic metrics ipv6_neighbor = False # IPv6 Reachable Neighbors @@ -66,6 +67,7 @@ wireless_clients = True # WLAN clients metrics capsman = True # CAPsMAN general metrics capsman_clients = True # CAPsMAN clients metrics + w60g = False # W60G metrics eoip = False # EoIP status metrics gre = False # GRE status metrics @@ -86,9 +88,12 @@ certificate = False # Certificates metrics container = False # Containers metrics - - remote_dhcp_entry = None # An MKTXP entry to provide for remote DHCP info / resolution - remote_capsman_entry = None # An MKTXP entry to provide for remote capsman info - use_comments_over_names = True # when available, forces using comments over the interfaces names + remote_dhcp_entry = None # An MKTXP entry to provide for remote DHCP info / resolution + remote_capsman_entry = None # An MKTXP entry to provide for remote capsman info + + interface_name_format = name # Format to use for interface / resource names, allowed values: 'name', 'comment', or 'combined' + # 'name': use interface name only (e.g. 'ether1') + # 'comment': use comment if available, fallback to name if not + # 'combined': use both (e.g. 'ether1 (Office Switch)') check_for_updates = False # check for available ROS updates