From 55824a347ff4ce9ee9b7ada483d6df5392674f9b Mon Sep 17 00:00:00 2001 From: hairmare <116588+hairmare@users.noreply.github.com> Date: Mon, 20 May 2024 12:51:18 +0200 Subject: [PATCH] chore: rm apache httpd override (#113) --- .../Apache_by_HTTP/6.4/Apache_by_HTTP.yaml | 822 ----------------- Overrides/Apache_by_HTTP/6.4/DIFF.md | 105 --- Overrides/Apache_by_HTTP/6.4/README.md | 863 ------------------ .../Apache_by_HTTP/6.4/docs/gen_ref_pages.py | 6 - Overrides/Apache_by_HTTP/6.4/mkdocs.yaml | 17 - README.md | 5 +- catalog-info.yaml | 72 -- hack/plays/manage.yml | 8 +- 8 files changed, 7 insertions(+), 1891 deletions(-) delete mode 100644 Overrides/Apache_by_HTTP/6.4/Apache_by_HTTP.yaml delete mode 100644 Overrides/Apache_by_HTTP/6.4/DIFF.md delete mode 100644 Overrides/Apache_by_HTTP/6.4/README.md delete mode 100644 Overrides/Apache_by_HTTP/6.4/docs/gen_ref_pages.py delete mode 100644 Overrides/Apache_by_HTTP/6.4/mkdocs.yaml diff --git a/Overrides/Apache_by_HTTP/6.4/Apache_by_HTTP.yaml b/Overrides/Apache_by_HTTP/6.4/Apache_by_HTTP.yaml deleted file mode 100644 index 2c335a97..00000000 --- a/Overrides/Apache_by_HTTP/6.4/Apache_by_HTTP.yaml +++ /dev/null @@ -1,822 +0,0 @@ -zabbix_export: - version: '6.4' - template_groups: - - uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6 - name: Templates/Applications - templates: - - uuid: 86702e8bc514434e8c914d50c206cb94 - template: 'Apache by HTTP' - name: 'Apache by HTTP' - description: | - Get metrics from mod_status module using HTTP agent. - https://httpd.apache.org/docs/current/mod/mod_status.html - - You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/384764-discussion-thread-for-official-zabbix-template-apache - - Generated by official Zabbix template tool "Templator" - - ## Changes - - These changes are part of [RaBe's Zabbix template and helpers - collection](https://github.com/radiorabe/rabe-zabbix). - - * Added `{$APACHE.STATUS.HOST}` instead of `{HOST.NAME}` for agentless use - vendor: - name: Zabbix - version: 6.4-0 - groups: - - name: Templates/Applications - items: - - uuid: b9fe6f0bbe174e9f81af84a3bc0b0e7c - name: 'Apache: Total bytes' - type: DEPENDENT - key: apache.bytes - delay: '0' - history: 7d - value_type: FLOAT - units: B - description: 'The total bytes served.' - preprocessing: - - type: JSONPATH - parameters: - - '$["Total kBytes"]' - - type: MULTIPLIER - parameters: - - '1024' - master_item: - key: apache.get_status - tags: - - tag: component - value: network - - uuid: b36010be10874cf188eeacc81f2c366f - name: 'Apache: Bytes per second' - type: DEPENDENT - key: apache.bytes.rate - delay: '0' - history: 7d - value_type: FLOAT - units: Bps - description: | - It is calculated as a rate of change for total bytes statistics. - `BytesPerSec` is not used, as it counts the average since the last Apache server start. - preprocessing: - - type: JSONPATH - parameters: - - '$["Total kBytes"]' - - type: MULTIPLIER - parameters: - - '1024' - - type: CHANGE_PER_SECOND - parameters: - - '' - master_item: - key: apache.get_status - tags: - - tag: component - value: network - - uuid: e61be8ad92004100aca55fcedd2a3807 - name: 'Apache: Get status' - type: HTTP_AGENT - key: apache.get_status - history: 1h - trends: '0' - value_type: TEXT - description: | - Getting data from a machine-readable version of the Apache status page. - For more information see Apache Module [mod_status](https://httpd.apache.org/docs/current/mod/mod_status.html). - preprocessing: - - type: JAVASCRIPT - parameters: - - | - var lines = value.split('\n'); - var output = {}, - workers = { - '_': 0, 'S': 0, 'R': 0, 'W': 0, - 'K': 0, 'D': 0, 'C': 0, 'L': 0, - 'G': 0, 'I': 0, '.': 0 - }; - - for (var i = 0; i < lines.length; i++) { - var line = lines[i].match(/([A-z0-9 ]+): (.*)/); - - if (line !== null) { - output[line[1]] = isNaN(line[2]) ? line[2] : Number(line[2]); - } - } - - output.ServerUptimeSeconds = output.ServerUptimeSeconds || output.Uptime; - output.ServerVersion = output.ServerVersion || output.Server; - - if (typeof output.Scoreboard === 'string') { - for (var i = 0; i < output.Scoreboard.length; i++) { - var char = output.Scoreboard[i]; - - workers[char]++; - } - } - - output.Workers = { - waiting: workers['_'], starting: workers['S'], reading: workers['R'], - sending: workers['W'], keepalive: workers['K'], dnslookup: workers['D'], - closing: workers['C'], logging: workers['L'], finishing: workers['G'], - cleanup: workers['I'], slot: workers['.'] - }; - - return JSON.stringify(output); - url: '{$APACHE.STATUS.SCHEME}://{$APACHE.STATUS.HOST}:{$APACHE.STATUS.PORT}/{$APACHE.STATUS.PATH}' - retrieve_mode: BOTH - tags: - - tag: component - value: raw - triggers: - - uuid: db396445cc5042f89f31dc12cb99c32e - expression: 'nodata(/Apache by HTTP/apache.get_status,30m)=1' - name: 'Apache: Failed to fetch status page' - event_name: 'Apache: Failed to fetch status page (or no data for 30m)' - priority: WARNING - description: 'Zabbix has not received any data for items for the last 30 minutes.' - manual_close: 'YES' - dependencies: - - name: 'Apache: Service is down' - expression: 'last(/Apache by HTTP/net.tcp.service[http,"{$APACHE.STATUS.HOST}","{$APACHE.STATUS.PORT}"])=0' - tags: - - tag: scope - value: availability - - uuid: 5fb5101de70a43fab50d55f418462255 - name: 'Apache: Total requests' - type: DEPENDENT - key: apache.requests - delay: '0' - history: 7d - description: 'The total number of the Apache server accesses.' - preprocessing: - - type: JSONPATH - parameters: - - '$["Total Accesses"]' - master_item: - key: apache.get_status - tags: - - tag: component - value: network - - uuid: ee15f4958040459da53251cc3561ed39 - name: 'Apache: Requests per second' - type: DEPENDENT - key: apache.requests.rate - delay: '0' - history: 7d - value_type: FLOAT - description: | - It is calculated as a rate of change for the "Total requests" statistics. - `ReqPerSec` is not used, as it counts the average since the last Apache server start. - preprocessing: - - type: JSONPATH - parameters: - - '$["Total Accesses"]' - - type: CHANGE_PER_SECOND - parameters: - - '' - master_item: - key: apache.get_status - tags: - - tag: component - value: network - - uuid: 3dd8ba505d584b028c7ac08d8b959eb3 - name: 'Apache: Uptime' - type: DEPENDENT - key: apache.uptime - delay: '0' - history: 7d - units: uptime - description: 'The service uptime expressed in seconds.' - preprocessing: - - type: JSONPATH - parameters: - - $.ServerUptimeSeconds - master_item: - key: apache.get_status - tags: - - tag: component - value: system - triggers: - - uuid: 76cfa6ebf39f4c8fbd8fde9e0f36d3ed - expression: 'last(/Apache by HTTP/apache.uptime)<10m' - name: 'Apache: Host has been restarted' - event_name: 'Apache: {HOST.NAME} has been restarted (uptime < 10m)' - priority: INFO - description: 'Uptime is less than 10 minutes.' - manual_close: 'YES' - tags: - - tag: scope - value: notice - - uuid: fe0de2eb1478482f99b38c13bd20564c - name: 'Apache: Version' - type: DEPENDENT - key: apache.version - delay: '0' - history: 7d - trends: '0' - value_type: CHAR - description: 'The Apache service version.' - preprocessing: - - type: JSONPATH - parameters: - - $.ServerVersion - - type: DISCARD_UNCHANGED_HEARTBEAT - parameters: - - 1d - master_item: - key: apache.get_status - tags: - - tag: component - value: system - triggers: - - uuid: 5296d69af0704d0e8a07398f0b4c9685 - expression: 'last(/Apache by HTTP/apache.version,#1)<>last(/Apache by HTTP/apache.version,#2) and length(last(/Apache by HTTP/apache.version))>0' - name: 'Apache: Version has changed' - event_name: 'Apache: Version has changed (new version: {ITEM.VALUE})' - priority: INFO - description: 'Apache version has changed. Acknowledge to close the problem manually.' - manual_close: 'YES' - tags: - - tag: scope - value: notice - - uuid: f74ffb92e30e48958b5b82f7dfbe5147 - name: 'Apache: Workers idle cleanup' - type: DEPENDENT - key: apache.workers.cleanup - delay: '0' - history: 7d - description: 'The number of workers in cleanup state.' - preprocessing: - - type: JSONPATH - parameters: - - $.Workers.cleanup - master_item: - key: apache.get_status - tags: - - tag: component - value: system - - uuid: d664bee9a330480bbaee7273b871a8d3 - name: 'Apache: Workers closing connection' - type: DEPENDENT - key: apache.workers.closing - delay: '0' - history: 7d - description: 'The number of workers in closing state.' - preprocessing: - - type: JSONPATH - parameters: - - $.Workers.closing - master_item: - key: apache.get_status - tags: - - tag: component - value: system - - uuid: a6fb3444585749be998ec840cd8e4511 - name: 'Apache: Workers DNS lookup' - type: DEPENDENT - key: apache.workers.dnslookup - delay: '0' - history: 7d - description: 'The number of workers in `dnslookup` state.' - preprocessing: - - type: JSONPATH - parameters: - - $.Workers.dnslookup - master_item: - key: apache.get_status - tags: - - tag: component - value: system - - uuid: fcf771f2a9b64a81a37db679f0494ed3 - name: 'Apache: Workers finishing' - type: DEPENDENT - key: apache.workers.finishing - delay: '0' - history: 7d - description: 'The number of workers in finishing state.' - preprocessing: - - type: JSONPATH - parameters: - - $.Workers.finishing - master_item: - key: apache.get_status - tags: - - tag: component - value: system - - uuid: cb81a6a77395444283bc5e065fcbfc2e - name: 'Apache: Workers keepalive (read)' - type: DEPENDENT - key: apache.workers.keepalive - delay: '0' - history: 7d - description: 'The number of workers in `keepalive` state.' - preprocessing: - - type: JSONPATH - parameters: - - $.Workers.keepalive - master_item: - key: apache.get_status - tags: - - tag: component - value: system - - uuid: 7fc0002a279b4541af569a03c1aca2ac - name: 'Apache: Workers logging' - type: DEPENDENT - key: apache.workers.logging - delay: '0' - history: 7d - description: 'The number of workers in logging state.' - preprocessing: - - type: JSONPATH - parameters: - - $.Workers.logging - master_item: - key: apache.get_status - tags: - - tag: component - value: system - - uuid: 78b0bd7d8bec49549fc003d460af9177 - name: 'Apache: Workers reading request' - type: DEPENDENT - key: apache.workers.reading - delay: '0' - history: 7d - description: 'The number of workers in reading state.' - preprocessing: - - type: JSONPATH - parameters: - - $.Workers.reading - master_item: - key: apache.get_status - tags: - - tag: component - value: system - - uuid: 379ac66397b94463ad17b24fbd20c615 - name: 'Apache: Workers sending reply' - type: DEPENDENT - key: apache.workers.sending - delay: '0' - history: 7d - description: 'The number of workers in sending state.' - preprocessing: - - type: JSONPATH - parameters: - - $.Workers.sending - master_item: - key: apache.get_status - tags: - - tag: component - value: system - - uuid: 1c90055e02a244fc8d18e73b23daa0f1 - name: 'Apache: Workers slot with no current process' - type: DEPENDENT - key: apache.workers.slot - delay: '0' - history: 7d - description: 'The number of slots with no current process.' - preprocessing: - - type: JSONPATH - parameters: - - $.Workers.slot - master_item: - key: apache.get_status - tags: - - tag: component - value: system - - uuid: ae21ea113e8840349aff81ab582d92b4 - name: 'Apache: Workers starting up' - type: DEPENDENT - key: apache.workers.starting - delay: '0' - history: 7d - description: 'The number of workers in starting state.' - preprocessing: - - type: JSONPATH - parameters: - - $.Workers.starting - master_item: - key: apache.get_status - tags: - - tag: component - value: system - - uuid: be1a05a6eab84b64ac4d51c966ea91e8 - name: 'Apache: Workers waiting for connection' - type: DEPENDENT - key: apache.workers.waiting - delay: '0' - history: 7d - description: 'The number of workers in waiting state.' - preprocessing: - - type: JSONPATH - parameters: - - $.Workers.waiting - master_item: - key: apache.get_status - tags: - - tag: component - value: system - - uuid: 1752b9bcf7b34abbaf105f5261638271 - name: 'Apache: Total workers busy' - type: DEPENDENT - key: apache.workers_total.busy - delay: '0' - history: 7d - description: 'The total number of busy worker threads/processes.' - preprocessing: - - type: JSONPATH - parameters: - - $.BusyWorkers - master_item: - key: apache.get_status - tags: - - tag: component - value: system - - uuid: b1b1c86a12964ae2813c63481e464ec7 - name: 'Apache: Total workers idle' - type: DEPENDENT - key: apache.workers_total.idle - delay: '0' - history: 7d - description: 'The total number of idle worker threads/processes.' - preprocessing: - - type: JSONPATH - parameters: - - $.IdleWorkers - master_item: - key: apache.get_status - tags: - - tag: component - value: system - - uuid: 5039d11bc3964d6e9928a0a46dd0b402 - name: 'Apache: Service response time' - type: SIMPLE - key: 'net.tcp.service.perf[http,"{$APACHE.STATUS.HOST}","{$APACHE.STATUS.PORT}"]' - history: 7d - value_type: FLOAT - units: s - tags: - - tag: component - value: application - - tag: component - value: health - triggers: - - uuid: ffbb564032c7462eb0bb9b4c2f700559 - expression: 'min(/Apache by HTTP/net.tcp.service.perf[http,"{$APACHE.STATUS.HOST}","{$APACHE.STATUS.PORT}"],5m)>{$APACHE.RESPONSE_TIME.MAX.WARN}' - name: 'Apache: Service response time is too high' - event_name: 'Apache: Service response time is too high (over {$APACHE.RESPONSE_TIME.MAX.WARN}s for 5m)' - priority: WARNING - manual_close: 'YES' - dependencies: - - name: 'Apache: Service is down' - expression: 'last(/Apache by HTTP/net.tcp.service[http,"{$APACHE.STATUS.HOST}","{$APACHE.STATUS.PORT}"])=0' - tags: - - tag: scope - value: performance - - uuid: fb65918695094026838e2b9e4ca00402 - name: 'Apache: Service ping' - type: SIMPLE - key: 'net.tcp.service[http,"{$APACHE.STATUS.HOST}","{$APACHE.STATUS.PORT}"]' - history: 7d - valuemap: - name: 'Service state' - preprocessing: - - type: DISCARD_UNCHANGED_HEARTBEAT - parameters: - - 10m - tags: - - tag: component - value: application - - tag: component - value: health - triggers: - - uuid: afe2fde35d054333adc8369a0f9af778 - expression: 'last(/Apache by HTTP/net.tcp.service[http,"{$APACHE.STATUS.HOST}","{$APACHE.STATUS.PORT}"])=0' - name: 'Apache: Service is down' - priority: AVERAGE - manual_close: 'YES' - tags: - - tag: scope - value: availability - discovery_rules: - - uuid: eee8abd3174d426092e8bca9b3ba982e - name: 'Event MPM discovery' - type: DEPENDENT - key: apache.mpm.event.discovery - delay: '0' - description: | - The discovery of additional metrics if the event Multi-Processing Module (MPM) is used. - For more details see [Apache MPM event](https://httpd.apache.org/docs/current/mod/event.html). - item_prototypes: - - uuid: f52700379f9a4ee8b378a2eb9caea070 - name: 'Apache: Bytes per request' - type: DEPENDENT - key: 'apache.bytes[per_request{#SINGLETON}]' - delay: '0' - history: 7d - value_type: FLOAT - units: B - description: 'The average number of client requests per second.' - preprocessing: - - type: JSONPATH - parameters: - - $.BytesPerReq - master_item: - key: apache.get_status - tags: - - tag: component - value: connection - - uuid: 062d7c941f0c468d8b63fa76ae0610f6 - name: 'Apache: Connections async closing' - type: DEPENDENT - key: 'apache.connections[async_closing{#SINGLETON}]' - delay: '0' - history: 7d - description: 'The number of asynchronous connections in closing state (applicable only to the event MPM).' - preprocessing: - - type: JSONPATH - parameters: - - $.ConnsAsyncClosing - master_item: - key: apache.get_status - tags: - - tag: component - value: connection - - uuid: 6cb8b255ad8343a48e622912bc298366 - name: 'Apache: Connections async keepalive' - type: DEPENDENT - key: 'apache.connections[async_keep_alive{#SINGLETON}]' - delay: '0' - history: 7d - description: 'The number of asynchronous connections in keepalive state (applicable only to the event MPM).' - preprocessing: - - type: JSONPATH - parameters: - - $.ConnsAsyncKeepAlive - master_item: - key: apache.get_status - tags: - - tag: component - value: connection - - uuid: 997b3452aac24ad6afbad775d649c727 - name: 'Apache: Connections async writing' - type: DEPENDENT - key: 'apache.connections[async_writing{#SINGLETON}]' - delay: '0' - history: 7d - description: 'The number of asynchronous connections in writing state (applicable only to the event MPM).' - preprocessing: - - type: JSONPATH - parameters: - - $.ConnsAsyncWriting - master_item: - key: apache.get_status - tags: - - tag: component - value: connection - - uuid: 31cb044eed904ca19150921fe36f3285 - name: 'Apache: Connections total' - type: DEPENDENT - key: 'apache.connections[total{#SINGLETON}]' - delay: '0' - history: 7d - description: 'The number of total connections.' - preprocessing: - - type: JSONPATH - parameters: - - $.ConnsTotal - master_item: - key: apache.get_status - tags: - - tag: component - value: connection - - uuid: 34555340f3ad4b878504df188f54a9c9 - name: 'Apache: Number of async processes' - type: DEPENDENT - key: 'apache.process[num{#SINGLETON}]' - delay: '0' - history: 7d - description: 'The number of asynchronous processes.' - preprocessing: - - type: JSONPATH - parameters: - - $.Processes - master_item: - key: apache.get_status - tags: - - tag: component - value: system - graph_prototypes: - - uuid: 066b53ed2244414ca3090498eb035c27 - name: 'Apache: Current async connections{#SINGLETON}' - graph_items: - - color: 199C0D - item: - host: 'Apache by HTTP' - key: 'apache.connections[async_closing{#SINGLETON}]' - - sortorder: '1' - color: F63100 - item: - host: 'Apache by HTTP' - key: 'apache.connections[async_keep_alive{#SINGLETON}]' - - sortorder: '2' - color: 00611C - item: - host: 'Apache by HTTP' - key: 'apache.connections[async_writing{#SINGLETON}]' - - sortorder: '3' - drawtype: BOLD_LINE - color: F7941D - item: - host: 'Apache by HTTP' - key: 'apache.connections[total{#SINGLETON}]' - - uuid: dbaa0c2468cc40fca977fb382d19cb78 - name: 'Apache: Current async processes{#SINGLETON}' - graph_items: - - drawtype: GRADIENT_LINE - color: 199C0D - item: - host: 'Apache by HTTP' - key: 'apache.process[num{#SINGLETON}]' - master_item: - key: apache.get_status - preprocessing: - - type: JAVASCRIPT - parameters: - - | - return JSON.stringify(JSON.parse(value).ServerMPM === 'event' - ? [{'{#SINGLETON}': ''}] : []); - - type: DISCARD_UNCHANGED_HEARTBEAT - parameters: - - 3h - tags: - - tag: class - value: software - - tag: target - value: apache - macros: - - macro: '{$APACHE.RESPONSE_TIME.MAX.WARN}' - value: '10' - description: 'The maximum Apache response time expressed in seconds for a trigger expression.' - - macro: '{$APACHE.STATUS.HOST}' - value: 127.0.0.1 - description: 'Hostname or IP of Apache HTTP server' - - macro: '{$APACHE.STATUS.PATH}' - value: 'server-status?auto' - description: 'The URL path.' - - macro: '{$APACHE.STATUS.PORT}' - value: '80' - description: 'The port of the Apache status page.' - - macro: '{$APACHE.STATUS.SCHEME}' - value: http - description: 'The request scheme, which may be either HTTP or HTTPS.' - dashboards: - - uuid: a328c9e713424465a8e1adec7322b0dc - name: 'Apache performance' - pages: - - name: General - widgets: - - type: graph - width: '24' - height: '7' - fields: - - type: GRAPH - name: graphid - value: - host: 'Apache by HTTP' - name: 'Apache: Worker states' - - type: graph - 'y': '7' - width: '12' - height: '5' - fields: - - type: GRAPH - name: graphid - value: - host: 'Apache by HTTP' - name: 'Apache: Requests per second' - - type: graphprototype - 'y': '12' - width: '12' - height: '5' - fields: - - type: INTEGER - name: columns - value: '1' - - type: GRAPH_PROTOTYPE - name: graphid - value: - host: 'Apache by HTTP' - name: 'Apache: Current async connections{#SINGLETON}' - - type: graph - x: '12' - 'y': '7' - width: '12' - height: '5' - fields: - - type: GRAPH - name: graphid - value: - host: 'Apache by HTTP' - name: 'Apache: Workers total' - - type: graphprototype - x: '12' - 'y': '12' - width: '12' - height: '5' - fields: - - type: INTEGER - name: columns - value: '1' - - type: GRAPH_PROTOTYPE - name: graphid - value: - host: 'Apache by HTTP' - name: 'Apache: Current async processes{#SINGLETON}' - valuemaps: - - uuid: a5d1f911fb264bd4bc087ea582626d7f - name: 'Service state' - mappings: - - value: '0' - newvalue: Down - - value: '1' - newvalue: Up - graphs: - - uuid: a3998992f7504a12826e3c4d592836b5 - name: 'Apache: Requests per second' - graph_items: - - drawtype: GRADIENT_LINE - color: 199C0D - item: - host: 'Apache by HTTP' - key: apache.requests.rate - - uuid: 1629062b5cd74b67af9a60226a79f8f1 - name: 'Apache: Worker states' - graph_items: - - color: 199C0D - item: - host: 'Apache by HTTP' - key: apache.workers.dnslookup - - sortorder: '1' - color: F63100 - item: - host: 'Apache by HTTP' - key: apache.workers.cleanup - - sortorder: '2' - color: 00611C - item: - host: 'Apache by HTTP' - key: apache.workers.logging - - sortorder: '3' - color: F7941D - item: - host: 'Apache by HTTP' - key: apache.workers.reading - - sortorder: '4' - color: FC6EA3 - item: - host: 'Apache by HTTP' - key: apache.workers.sending - - sortorder: '5' - color: 6C59DC - item: - host: 'Apache by HTTP' - key: apache.workers.starting - - sortorder: '6' - color: C7A72D - item: - host: 'Apache by HTTP' - key: apache.workers.closing - - sortorder: '7' - color: BA2A5D - item: - host: 'Apache by HTTP' - key: apache.workers.finishing - - sortorder: '8' - color: F230E0 - item: - host: 'Apache by HTTP' - key: apache.workers.keepalive - - sortorder: '9' - color: 5CCD18 - item: - host: 'Apache by HTTP' - key: apache.workers.slot - - sortorder: '10' - color: BB2A02 - item: - host: 'Apache by HTTP' - key: apache.workers.waiting - - uuid: 78e59f1b5eb747019f92921ac5ef48b0 - name: 'Apache: Workers total' - type: STACKED - graph_items: - - color: 199C0D - item: - host: 'Apache by HTTP' - key: apache.workers_total.busy - - sortorder: '1' - color: F63100 - item: - host: 'Apache by HTTP' - key: apache.workers_total.idle diff --git a/Overrides/Apache_by_HTTP/6.4/DIFF.md b/Overrides/Apache_by_HTTP/6.4/DIFF.md deleted file mode 100644 index 38041381..00000000 --- a/Overrides/Apache_by_HTTP/6.4/DIFF.md +++ /dev/null @@ -1,105 +0,0 @@ -# Compare Rabe Override with Upstream Template - -Original: [Apache by HTTP](https://raw.githubusercontent.com/zabbix/zabbix/release/6.4/templates/app/apache_http/template_app_apache_http.yaml) - -## Diff - -```diff ---- before -+++ after -@@ -14,6 +14,13 @@ - You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/384764-discussion-thread-for-official-zabbix-template-apache - - Generated by official Zabbix template tool "Templator" -+ -+ ## Changes -+ -+ These changes are part of [RaBe's Zabbix template and helpers -+ collection](https://github.com/radiorabe/rabe-zabbix). -+ -+ * Added `{$APACHE.STATUS.HOST}` instead of `{HOST.NAME}` for agentless use - vendor: - name: Zabbix - version: 6.4-0 -@@ -52,7 +59,6 @@ - description: | - It is calculated as a rate of change for total bytes statistics. - `BytesPerSec` is not used, as it counts the average since the last Apache server start. -- - preprocessing: - - type: JSONPATH - parameters: -@@ -117,7 +123,7 @@ - }; - - return JSON.stringify(output); -- url: '{$APACHE.STATUS.SCHEME}://{HOST.CONN}:{$APACHE.STATUS.PORT}/{$APACHE.STATUS.PATH}' -+ url: '{$APACHE.STATUS.SCHEME}://{$APACHE.STATUS.HOST}:{$APACHE.STATUS.PORT}/{$APACHE.STATUS.PATH}' - retrieve_mode: BOTH - tags: - - tag: component -@@ -132,7 +138,7 @@ - manual_close: 'YES' - dependencies: - - name: 'Apache: Service is down' -- expression: 'last(/Apache by HTTP/net.tcp.service[http,"{HOST.CONN}","{$APACHE.STATUS.PORT}"])=0' -+ expression: 'last(/Apache by HTTP/net.tcp.service[http,"{$APACHE.STATUS.HOST}","{$APACHE.STATUS.PORT}"])=0' - tags: - - tag: scope - value: availability -@@ -445,7 +451,7 @@ - - uuid: 5039d11bc3964d6e9928a0a46dd0b402 - name: 'Apache: Service response time' - type: SIMPLE -- key: 'net.tcp.service.perf[http,"{HOST.CONN}","{$APACHE.STATUS.PORT}"]' -+ key: 'net.tcp.service.perf[http,"{$APACHE.STATUS.HOST}","{$APACHE.STATUS.PORT}"]' - history: 7d - value_type: FLOAT - units: s -@@ -456,21 +462,21 @@ - value: health - triggers: - - uuid: ffbb564032c7462eb0bb9b4c2f700559 -- expression: 'min(/Apache by HTTP/net.tcp.service.perf[http,"{HOST.CONN}","{$APACHE.STATUS.PORT}"],5m)>{$APACHE.RESPONSE_TIME.MAX.WARN}' -+ expression: 'min(/Apache by HTTP/net.tcp.service.perf[http,"{$APACHE.STATUS.HOST}","{$APACHE.STATUS.PORT}"],5m)>{$APACHE.RESPONSE_TIME.MAX.WARN}' - name: 'Apache: Service response time is too high' - event_name: 'Apache: Service response time is too high (over {$APACHE.RESPONSE_TIME.MAX.WARN}s for 5m)' - priority: WARNING - manual_close: 'YES' - dependencies: - - name: 'Apache: Service is down' -- expression: 'last(/Apache by HTTP/net.tcp.service[http,"{HOST.CONN}","{$APACHE.STATUS.PORT}"])=0' -+ expression: 'last(/Apache by HTTP/net.tcp.service[http,"{$APACHE.STATUS.HOST}","{$APACHE.STATUS.PORT}"])=0' - tags: - - tag: scope - value: performance - - uuid: fb65918695094026838e2b9e4ca00402 - name: 'Apache: Service ping' - type: SIMPLE -- key: 'net.tcp.service[http,"{HOST.CONN}","{$APACHE.STATUS.PORT}"]' -+ key: 'net.tcp.service[http,"{$APACHE.STATUS.HOST}","{$APACHE.STATUS.PORT}"]' - history: 7d - valuemap: - name: 'Service state' -@@ -485,7 +491,7 @@ - value: health - triggers: - - uuid: afe2fde35d054333adc8369a0f9af778 -- expression: 'last(/Apache by HTTP/net.tcp.service[http,"{HOST.CONN}","{$APACHE.STATUS.PORT}"])=0' -+ expression: 'last(/Apache by HTTP/net.tcp.service[http,"{$APACHE.STATUS.HOST}","{$APACHE.STATUS.PORT}"])=0' - name: 'Apache: Service is down' - priority: AVERAGE - manual_close: 'YES' -@@ -652,6 +658,9 @@ - - macro: '{$APACHE.RESPONSE_TIME.MAX.WARN}' - value: '10' - description: 'The maximum Apache response time expressed in seconds for a trigger expression.' -+ - macro: '{$APACHE.STATUS.HOST}' -+ value: 127.0.0.1 -+ description: 'Hostname or IP of Apache HTTP server' - - macro: '{$APACHE.STATUS.PATH}' - value: 'server-status?auto' - description: 'The URL path.' - - -``` diff --git a/Overrides/Apache_by_HTTP/6.4/README.md b/Overrides/Apache_by_HTTP/6.4/README.md deleted file mode 100644 index cf9e0b41..00000000 --- a/Overrides/Apache_by_HTTP/6.4/README.md +++ /dev/null @@ -1,863 +0,0 @@ -# Zabbix Template: Apache by HTTP - -![class: software](https://img.shields.io/badge/class-software-00c9bf) ![target: apache](https://img.shields.io/badge/target-apache-00c9bf) ![vendor: Zabbix](https://img.shields.io/badge/vendor-Zabbix-00c9bf) ![version: 6.4-0](https://img.shields.io/badge/version-6.4--0-00c9bf) - -Get metrics from mod_status module using HTTP agent. -https://httpd.apache.org/docs/current/mod/mod_status.html - -You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/384764-discussion-thread-for-official-zabbix-template-apache - -Generated by official Zabbix template tool "Templator" - -## Changes - -These changes are part of [RaBe's Zabbix template and helpers -collection](https://github.com/radiorabe/rabe-zabbix). - -* Added `{$APACHE.STATUS.HOST}` instead of `{HOST.NAME}` for agentless use - -## Items - -### Item: Apache: Total bytes - -![component: network](https://img.shields.io/badge/component-network-00c9bf) - -The total bytes served. - -```console -apache.bytes -``` - -Settings: - -| Item Setting | Value | -| ------------ | ----- | -| Type | DEPENDENT | -| Value type | FLOAT in B | -| History | 7d | -| Source item | `apache.get_status` | - -Preprocessing steps: - -| Type | Parameters | -| ---- | ---------- | -| JSONPATH | `["$[\"Total kBytes\"]"]` | -| MULTIPLIER | `["1024"]` | - -### Item: Apache: Bytes per second - -![component: network](https://img.shields.io/badge/component-network-00c9bf) - -It is calculated as a rate of change for total bytes statistics. -`BytesPerSec` is not used, as it counts the average since the last Apache server start. - -```console -apache.bytes.rate -``` - -Settings: - -| Item Setting | Value | -| ------------ | ----- | -| Type | DEPENDENT | -| Value type | FLOAT in Bps | -| History | 7d | -| Source item | `apache.get_status` | - -Preprocessing steps: - -| Type | Parameters | -| ---- | ---------- | -| JSONPATH | `["$[\"Total kBytes\"]"]` | -| MULTIPLIER | `["1024"]` | -| CHANGE_PER_SECOND | `[""]` | - -### Item: Apache: Get status - -![component: raw](https://img.shields.io/badge/component-raw-00c9bf) - -Getting data from a machine-readable version of the Apache status page. -For more information see Apache Module [mod_status](https://httpd.apache.org/docs/current/mod/mod_status.html). - -```console -apache.get_status -``` - -Settings: - -| Item Setting | Value | -| ------------ | ----- | -| Type | HTTP_AGENT | -| Value type | TEXT | -| History | 1h | - -### Item: Apache: Total requests - -![component: network](https://img.shields.io/badge/component-network-00c9bf) - -The total number of the Apache server accesses. - -```console -apache.requests -``` - -Settings: - -| Item Setting | Value | -| ------------ | ----- | -| Type | DEPENDENT | -| History | 7d | -| Source item | `apache.get_status` | - -Preprocessing steps: - -| Type | Parameters | -| ---- | ---------- | -| JSONPATH | `["$[\"Total Accesses\"]"]` | - -### Item: Apache: Requests per second - -![component: network](https://img.shields.io/badge/component-network-00c9bf) - -It is calculated as a rate of change for the "Total requests" statistics. -`ReqPerSec` is not used, as it counts the average since the last Apache server start. - -```console -apache.requests.rate -``` - -Settings: - -| Item Setting | Value | -| ------------ | ----- | -| Type | DEPENDENT | -| Value type | FLOAT | -| History | 7d | -| Source item | `apache.get_status` | - -Preprocessing steps: - -| Type | Parameters | -| ---- | ---------- | -| JSONPATH | `["$[\"Total Accesses\"]"]` | -| CHANGE_PER_SECOND | `[""]` | - -### Item: Apache: Uptime - -![component: system](https://img.shields.io/badge/component-system-00c9bf) - -The service uptime expressed in seconds. - -```console -apache.uptime -``` - -Settings: - -| Item Setting | Value | -| ------------ | ----- | -| Type | DEPENDENT | -| History | 7d | -| Source item | `apache.get_status` | - -Preprocessing steps: - -| Type | Parameters | -| ---- | ---------- | -| JSONPATH | `["$.ServerUptimeSeconds"]` | - -### Item: Apache: Version - -![component: system](https://img.shields.io/badge/component-system-00c9bf) - -The Apache service version. - -```console -apache.version -``` - -Settings: - -| Item Setting | Value | -| ------------ | ----- | -| Type | DEPENDENT | -| Value type | CHAR | -| History | 7d | -| Source item | `apache.get_status` | - -Preprocessing steps: - -| Type | Parameters | -| ---- | ---------- | -| JSONPATH | `["$.ServerVersion"]` | -| DISCARD_UNCHANGED_HEARTBEAT | `["1d"]` | - -### Item: Apache: Workers idle cleanup - -![component: system](https://img.shields.io/badge/component-system-00c9bf) - -The number of workers in cleanup state. - -```console -apache.workers.cleanup -``` - -Settings: - -| Item Setting | Value | -| ------------ | ----- | -| Type | DEPENDENT | -| History | 7d | -| Source item | `apache.get_status` | - -Preprocessing steps: - -| Type | Parameters | -| ---- | ---------- | -| JSONPATH | `["$.Workers.cleanup"]` | - -### Item: Apache: Workers closing connection - -![component: system](https://img.shields.io/badge/component-system-00c9bf) - -The number of workers in closing state. - -```console -apache.workers.closing -``` - -Settings: - -| Item Setting | Value | -| ------------ | ----- | -| Type | DEPENDENT | -| History | 7d | -| Source item | `apache.get_status` | - -Preprocessing steps: - -| Type | Parameters | -| ---- | ---------- | -| JSONPATH | `["$.Workers.closing"]` | - -### Item: Apache: Workers DNS lookup - -![component: system](https://img.shields.io/badge/component-system-00c9bf) - -The number of workers in `dnslookup` state. - -```console -apache.workers.dnslookup -``` - -Settings: - -| Item Setting | Value | -| ------------ | ----- | -| Type | DEPENDENT | -| History | 7d | -| Source item | `apache.get_status` | - -Preprocessing steps: - -| Type | Parameters | -| ---- | ---------- | -| JSONPATH | `["$.Workers.dnslookup"]` | - -### Item: Apache: Workers finishing - -![component: system](https://img.shields.io/badge/component-system-00c9bf) - -The number of workers in finishing state. - -```console -apache.workers.finishing -``` - -Settings: - -| Item Setting | Value | -| ------------ | ----- | -| Type | DEPENDENT | -| History | 7d | -| Source item | `apache.get_status` | - -Preprocessing steps: - -| Type | Parameters | -| ---- | ---------- | -| JSONPATH | `["$.Workers.finishing"]` | - -### Item: Apache: Workers keepalive (read) - -![component: system](https://img.shields.io/badge/component-system-00c9bf) - -The number of workers in `keepalive` state. - -```console -apache.workers.keepalive -``` - -Settings: - -| Item Setting | Value | -| ------------ | ----- | -| Type | DEPENDENT | -| History | 7d | -| Source item | `apache.get_status` | - -Preprocessing steps: - -| Type | Parameters | -| ---- | ---------- | -| JSONPATH | `["$.Workers.keepalive"]` | - -### Item: Apache: Workers logging - -![component: system](https://img.shields.io/badge/component-system-00c9bf) - -The number of workers in logging state. - -```console -apache.workers.logging -``` - -Settings: - -| Item Setting | Value | -| ------------ | ----- | -| Type | DEPENDENT | -| History | 7d | -| Source item | `apache.get_status` | - -Preprocessing steps: - -| Type | Parameters | -| ---- | ---------- | -| JSONPATH | `["$.Workers.logging"]` | - -### Item: Apache: Workers reading request - -![component: system](https://img.shields.io/badge/component-system-00c9bf) - -The number of workers in reading state. - -```console -apache.workers.reading -``` - -Settings: - -| Item Setting | Value | -| ------------ | ----- | -| Type | DEPENDENT | -| History | 7d | -| Source item | `apache.get_status` | - -Preprocessing steps: - -| Type | Parameters | -| ---- | ---------- | -| JSONPATH | `["$.Workers.reading"]` | - -### Item: Apache: Workers sending reply - -![component: system](https://img.shields.io/badge/component-system-00c9bf) - -The number of workers in sending state. - -```console -apache.workers.sending -``` - -Settings: - -| Item Setting | Value | -| ------------ | ----- | -| Type | DEPENDENT | -| History | 7d | -| Source item | `apache.get_status` | - -Preprocessing steps: - -| Type | Parameters | -| ---- | ---------- | -| JSONPATH | `["$.Workers.sending"]` | - -### Item: Apache: Workers slot with no current process - -![component: system](https://img.shields.io/badge/component-system-00c9bf) - -The number of slots with no current process. - -```console -apache.workers.slot -``` - -Settings: - -| Item Setting | Value | -| ------------ | ----- | -| Type | DEPENDENT | -| History | 7d | -| Source item | `apache.get_status` | - -Preprocessing steps: - -| Type | Parameters | -| ---- | ---------- | -| JSONPATH | `["$.Workers.slot"]` | - -### Item: Apache: Workers starting up - -![component: system](https://img.shields.io/badge/component-system-00c9bf) - -The number of workers in starting state. - -```console -apache.workers.starting -``` - -Settings: - -| Item Setting | Value | -| ------------ | ----- | -| Type | DEPENDENT | -| History | 7d | -| Source item | `apache.get_status` | - -Preprocessing steps: - -| Type | Parameters | -| ---- | ---------- | -| JSONPATH | `["$.Workers.starting"]` | - -### Item: Apache: Workers waiting for connection - -![component: system](https://img.shields.io/badge/component-system-00c9bf) - -The number of workers in waiting state. - -```console -apache.workers.waiting -``` - -Settings: - -| Item Setting | Value | -| ------------ | ----- | -| Type | DEPENDENT | -| History | 7d | -| Source item | `apache.get_status` | - -Preprocessing steps: - -| Type | Parameters | -| ---- | ---------- | -| JSONPATH | `["$.Workers.waiting"]` | - -### Item: Apache: Total workers busy - -![component: system](https://img.shields.io/badge/component-system-00c9bf) - -The total number of busy worker threads/processes. - -```console -apache.workers_total.busy -``` - -Settings: - -| Item Setting | Value | -| ------------ | ----- | -| Type | DEPENDENT | -| History | 7d | -| Source item | `apache.get_status` | - -Preprocessing steps: - -| Type | Parameters | -| ---- | ---------- | -| JSONPATH | `["$.BusyWorkers"]` | - -### Item: Apache: Total workers idle - -![component: system](https://img.shields.io/badge/component-system-00c9bf) - -The total number of idle worker threads/processes. - -```console -apache.workers_total.idle -``` - -Settings: - -| Item Setting | Value | -| ------------ | ----- | -| Type | DEPENDENT | -| History | 7d | -| Source item | `apache.get_status` | - -Preprocessing steps: - -| Type | Parameters | -| ---- | ---------- | -| JSONPATH | `["$.IdleWorkers"]` | - -### Item: Apache: Service response time - -![component: application](https://img.shields.io/badge/component-application-00c9bf) ![component: health](https://img.shields.io/badge/component-health-00c9bf) - - - -```console -net.tcp.service.perf[http,"{$APACHE.STATUS.HOST}","{$APACHE.STATUS.PORT}"] -``` - -Settings: - -| Item Setting | Value | -| ------------ | ----- | -| Type | SIMPLE | -| Value type | FLOAT in s | -| History | 7d | - -### Item: Apache: Service ping - -![component: application](https://img.shields.io/badge/component-application-00c9bf) ![component: health](https://img.shields.io/badge/component-health-00c9bf) - - - -```console -net.tcp.service[http,"{$APACHE.STATUS.HOST}","{$APACHE.STATUS.PORT}"] -``` - -Settings: - -| Item Setting | Value | -| ------------ | ----- | -| Type | SIMPLE | -| History | 7d | - -## Triggers - -### Trigger: Apache: Failed to fetch status page - -![scope: availability](https://img.shields.io/badge/scope-availability-00c9bf) - -Zabbix has not received any data for items for the last 30 minutes. -Settings: - -| Trigger Setting | Values | -| --------------- | ------ | -| Priority | WARNING | -| Manual close | YES | - -```console -nodata(/Apache by HTTP/apache.get_status,30m)=1 -``` - -### Trigger: Apache: Host has been restarted - -![scope: notice](https://img.shields.io/badge/scope-notice-00c9bf) - -Uptime is less than 10 minutes. -Settings: - -| Trigger Setting | Values | -| --------------- | ------ | -| Priority | INFO | -| Manual close | YES | - -```console -last(/Apache by HTTP/apache.uptime)<10m -``` - -### Trigger: Apache: Version has changed - -![scope: notice](https://img.shields.io/badge/scope-notice-00c9bf) - -Apache version has changed. Acknowledge to close the problem manually. -Settings: - -| Trigger Setting | Values | -| --------------- | ------ | -| Priority | INFO | -| Manual close | YES | - -```console -last(/Apache by HTTP/apache.version,#1)<>last(/Apache by HTTP/apache.version,#2) and length(last(/Apache by HTTP/apache.version))>0 -``` - -### Trigger: Apache: Service response time is too high - -![scope: performance](https://img.shields.io/badge/scope-performance-00c9bf) - - -Settings: - -| Trigger Setting | Values | -| --------------- | ------ | -| Priority | WARNING | -| Manual close | YES | - -```console -min(/Apache by HTTP/net.tcp.service.perf[http,"{$APACHE.STATUS.HOST}","{$APACHE.STATUS.PORT}"],5m)>{$APACHE.RESPONSE_TIME.MAX.WARN} -``` - -### Trigger: Apache: Service is down - -![scope: availability](https://img.shields.io/badge/scope-availability-00c9bf) - - -Settings: - -| Trigger Setting | Values | -| --------------- | ------ | -| Priority | AVERAGE | -| Manual close | YES | - -```console -last(/Apache by HTTP/net.tcp.service[http,"{$APACHE.STATUS.HOST}","{$APACHE.STATUS.PORT}"])=0 -``` - -## Discovery Rules - -### Discovery Rule: Event MPM discovery - -The discovery of additional metrics if the event Multi-Processing Module (MPM) is used. -For more details see [Apache MPM event](https://httpd.apache.org/docs/current/mod/event.html). - - -```console -apache.mpm.event.discovery -``` - -Settings: - -| Item Setting | Value | -| ------------ | ----- | -| Type | DEPENDENT | -| Source item | `apache.get_status` | - -Preprocessing steps: - -| Type | Parameters | -| ---- | ---------- | -| JAVASCRIPT | `["return JSON.stringify(JSON.parse(value).ServerMPM === 'event'\n\t? [{'{#SINGLETON}': ''}] : []);\n"]` | -| DISCARD_UNCHANGED_HEARTBEAT | `["3h"]` | - -#### Discovery Rule: Event MPM discovery: Item Prototypes - -##### Discovery Rule: Event MPM discovery: Item Prototype: Apache: Bytes per request - -![component: connection](https://img.shields.io/badge/component-connection-00c9bf) - -The average number of client requests per second. - -```console -apache.bytes[per_request{#SINGLETON}] -``` - -Settings: - -| Item Setting | Value | -| ------------ | ----- | -| Type | DEPENDENT | -| Value type | FLOAT in B | -| History | 7d | -| Source item | `apache.get_status` | - -Preprocessing steps: - -| Type | Parameters | -| ---- | ---------- | -| JSONPATH | `["$.BytesPerReq"]` | - -##### Discovery Rule: Event MPM discovery: Item Prototype: Apache: Connections async closing - -![component: connection](https://img.shields.io/badge/component-connection-00c9bf) - -The number of asynchronous connections in closing state (applicable only to the event MPM). - -```console -apache.connections[async_closing{#SINGLETON}] -``` - -Settings: - -| Item Setting | Value | -| ------------ | ----- | -| Type | DEPENDENT | -| History | 7d | -| Source item | `apache.get_status` | - -Preprocessing steps: - -| Type | Parameters | -| ---- | ---------- | -| JSONPATH | `["$.ConnsAsyncClosing"]` | - -##### Discovery Rule: Event MPM discovery: Item Prototype: Apache: Connections async keepalive - -![component: connection](https://img.shields.io/badge/component-connection-00c9bf) - -The number of asynchronous connections in keepalive state (applicable only to the event MPM). - -```console -apache.connections[async_keep_alive{#SINGLETON}] -``` - -Settings: - -| Item Setting | Value | -| ------------ | ----- | -| Type | DEPENDENT | -| History | 7d | -| Source item | `apache.get_status` | - -Preprocessing steps: - -| Type | Parameters | -| ---- | ---------- | -| JSONPATH | `["$.ConnsAsyncKeepAlive"]` | - -##### Discovery Rule: Event MPM discovery: Item Prototype: Apache: Connections async writing - -![component: connection](https://img.shields.io/badge/component-connection-00c9bf) - -The number of asynchronous connections in writing state (applicable only to the event MPM). - -```console -apache.connections[async_writing{#SINGLETON}] -``` - -Settings: - -| Item Setting | Value | -| ------------ | ----- | -| Type | DEPENDENT | -| History | 7d | -| Source item | `apache.get_status` | - -Preprocessing steps: - -| Type | Parameters | -| ---- | ---------- | -| JSONPATH | `["$.ConnsAsyncWriting"]` | - -##### Discovery Rule: Event MPM discovery: Item Prototype: Apache: Connections total - -![component: connection](https://img.shields.io/badge/component-connection-00c9bf) - -The number of total connections. - -```console -apache.connections[total{#SINGLETON}] -``` - -Settings: - -| Item Setting | Value | -| ------------ | ----- | -| Type | DEPENDENT | -| History | 7d | -| Source item | `apache.get_status` | - -Preprocessing steps: - -| Type | Parameters | -| ---- | ---------- | -| JSONPATH | `["$.ConnsTotal"]` | - -##### Discovery Rule: Event MPM discovery: Item Prototype: Apache: Number of async processes - -![component: system](https://img.shields.io/badge/component-system-00c9bf) - -The number of asynchronous processes. - -```console -apache.process[num{#SINGLETON}] -``` - -Settings: - -| Item Setting | Value | -| ------------ | ----- | -| Type | DEPENDENT | -| History | 7d | -| Source item | `apache.get_status` | - -Preprocessing steps: - -| Type | Parameters | -| ---- | ---------- | -| JSONPATH | `["$.Processes"]` | - -#### Discovery Rule: Event MPM discovery: Graph Prototypes - -The following graph prototypes are defined by this Template - -* Apache: Current async connections{#SINGLETON} -* Apache: Current async processes{#SINGLETON} - - -## Macros - -The following Zabbix macros are configured via this template. - -### Macro: `{$APACHE.RESPONSE_TIME.MAX.WARN}` - -The maximum Apache response time expressed in seconds for a trigger expression. - -Default: - -```console -10 -``` - -### Macro: `{$APACHE.STATUS.HOST}` - -Hostname or IP of Apache HTTP server - -Default: - -```console -127.0.0.1 -``` - -### Macro: `{$APACHE.STATUS.PATH}` - -The URL path. - -Default: - -```console -server-status?auto -``` - -### Macro: `{$APACHE.STATUS.PORT}` - -The port of the Apache status page. - -Default: - -```console -80 -``` - -### Macro: `{$APACHE.STATUS.SCHEME}` - -The request scheme, which may be either HTTP or HTTPS. - -Default: - -```console -http -``` - -## Dashboards - -The following Zabbix dashboards are included in this template. - -* Apache performance diff --git a/Overrides/Apache_by_HTTP/6.4/docs/gen_ref_pages.py b/Overrides/Apache_by_HTTP/6.4/docs/gen_ref_pages.py deleted file mode 100644 index bd02be1b..00000000 --- a/Overrides/Apache_by_HTTP/6.4/docs/gen_ref_pages.py +++ /dev/null @@ -1,6 +0,0 @@ -from pathlib import Path - -import mkdocs_gen_files - -with mkdocs_gen_files.open("index.md", "w", encoding="utf-8") as index: - index.writelines(Path("README.md").open("r").read()) diff --git a/Overrides/Apache_by_HTTP/6.4/mkdocs.yaml b/Overrides/Apache_by_HTTP/6.4/mkdocs.yaml deleted file mode 100644 index 33f87391..00000000 --- a/Overrides/Apache_by_HTTP/6.4/mkdocs.yaml +++ /dev/null @@ -1,17 +0,0 @@ -site_name: "Zabbix Template: Apache by HTTP" -repo_url: https://github.com/radiorabe/rabe-zabbix -repo_name: radiorabe/rabe-zabbix -markdown_extensions: - - pymdownx.highlight: - anchor_linenums: true - - pymdownx.inlinehilite - - pymdownx.snippets - - pymdownx.superfences -plugins: - - search - - gen-files: - scripts: - - docs/gen_ref_pages.py - - literate-nav -nav: - - README: index.md diff --git a/README.md b/README.md index 24e479ba..64beb7b8 100644 --- a/README.md +++ b/README.md @@ -141,10 +141,7 @@ In some cases we override the Zabbix out-of-the-box templates to ensure they fit our use case. We publish the changed templates along with a generated diff against its upstream version. -| Name | 6.4 | 7.0 | -| ---- | --- | --- | -| Apache by HTTP | [✅](./Overrides/Apache_by_HTTP/6.4) | | -| Nginx by HTTP | [✅](./Overrides/Nginx_by_HTTP/6.4) | | +Currently, there are no such changes! ## Zabbix Version Support diff --git a/catalog-info.yaml b/catalog-info.yaml index 1b57c268..47ed699e 100644 --- a/catalog-info.yaml +++ b/catalog-info.yaml @@ -32,78 +32,6 @@ spec: owner: it-reaktion system: rabe-zabbix --- -# Overrides/Apache_by_HTTP/6.4/Apache_by_HTTP.yaml -apiVersion: backstage.io/v1alpha1 -kind: Component -metadata: - name: zabbix-template-Apache_by_HTTP - title: "Zabbix Template: Apache by HTTP" - description: | - Get metrics from mod_status module using HTTP agent. - https://httpd.apache.org/docs/current/mod/mod_status.html - - You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/384764-discussion-thread-for-official-zabbix-template-apache - - Generated by official Zabbix template tool "Templator" - - ## Changes - - These changes are part of [RaBe's Zabbix template and helpers - collection](https://github.com/radiorabe/rabe-zabbix). - - * Added `{$APACHE.STATUS.HOST}` instead of `{HOST.NAME}` for agentless use - - annotations: - backstage.io/techdocs-ref: dir:./Overrides/Apache_by_HTTP/6.4 - github.com/project-slug: radiorabe/rabe-zabbix - links: - - url: https://github.com/radiorabe/rabe-zabbix/tree/develop/Overrides/Apache_by_HTTP/6.4 - title: GitHub - icon: github - tags: [software, apache] -spec: - type: zabbix-template - lifecycle: experimental - owner: it-reaktion - system: rabe-zabbix - subcomponentOf: rabe-zabbix-templates ---- -# Overrides/Nginx_by_HTTP/6.4/Nginx_by_HTTP.yaml -apiVersion: backstage.io/v1alpha1 -kind: Component -metadata: - name: zabbix-template-Nginx_by_HTTP - title: "Zabbix Template: Nginx by HTTP" - description: | - Get metrics from stub status module using HTTP agent - https://nginx.ru/en/docs/http/ngx_http_stub_status_module.html. - - You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/384765-discussion-thread-for-official-zabbix-template-nginx - - Generated by official Zabbix template tool "Templator" - - ## Changes - - These changes are part of [RaBe's Zabbix template and helpers - collection](https://github.com/radiorabe/rabe-zabbix). - - * Added `{$NGINX.STUB_STATUS.HOST}` instead of `{HOST.NAME}` for agentless use - - annotations: - backstage.io/techdocs-ref: dir:./Overrides/Nginx_by_HTTP/6.4 - github.com/project-slug: radiorabe/rabe-zabbix - links: - - url: https://github.com/radiorabe/rabe-zabbix/tree/develop/Overrides/Nginx_by_HTTP/6.4 - title: GitHub - icon: github - tags: [software, nginx] -spec: - type: zabbix-template - lifecycle: experimental - owner: it-reaktion - system: rabe-zabbix - subcomponentOf: rabe-zabbix-templates ---- # Stacks/Applications/Apache_with_TLS_by_HTTP_Stack/6.4/Apache_with_TLS_by_HTTP_Stack.yaml apiVersion: backstage.io/v1alpha1 kind: Component diff --git a/hack/plays/manage.yml b/hack/plays/manage.yml index 4f3c0d49..325cd2df 100644 --- a/hack/plays/manage.yml +++ b/hack/plays/manage.yml @@ -33,10 +33,10 @@ - template_name: "timedatectl" - template_name: "tuned" - template_name: "Zabbix unsupported items" - upstream_templates: + upstream_templates: [] # nothing needed, currently + __: # items below are "commented" :) - template_name: "Apache by HTTP" upstream: "app/apache_http/template_app_apache_http.yaml" - __: # items below are "commented" :) - template_name: "Nginx by HTTP" upstream: "app/nginx_http/template_app_nginx_http.yaml" - template_name: "RabbitMQ cluster by HTTP" @@ -246,6 +246,7 @@ ensure they fit our use case. We publish the changed templates along with a generated diff against its upstream version. + {% if flat_overrides %} | Name | 6.4 | 7.0 | | ---- | --- | --- | {% for override in flat_overrides %} @@ -253,6 +254,9 @@ | {{ override.split('/')[1] | replace("_", " ") }} | {% if '6.4' in override %}[✅](./{{ override }}){% endif %} | {% if '7.0' in override %}[✅](./{{ override }}){% endif %} | {% endif %} {% endfor %} + {% else %} + Currently, there are no such changes! + {% endif %} ## Zabbix Version Support