Skip to content

Commit

Permalink
Added 'MAIN.shm_records', 'MAIN.shm_flushes', 'MAIN.shm_cont' and 'MA…
Browse files Browse the repository at this point in the history
…IN.shm_cycles'
  • Loading branch information
davidfb committed Dec 14, 2023
1 parent 389e34b commit c9b2ada
Show file tree
Hide file tree
Showing 3 changed files with 84 additions and 0 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
- ?:
- Added 'MAIN.shm_records', 'MAIN.shm_flushes', 'MAIN.shm_cont' and 'MAIN.shm_cycles'.

- 25.0 (2023-11-03):
- Fixed typo on 'MAIN.sc_rapid_reset' item name.

Expand Down
76 changes: 76 additions & 0 deletions template-app-varnish-cache.j2
Original file line number Diff line number Diff line change
Expand Up @@ -3379,6 +3379,82 @@
},
],
},
{
'id': 'item-prototype-1.159',
'name': 'MAIN.shm_records (SHM records / sec)',
'type': 'DEPENDENT',
'key': 'varnish.stat["{#LOCATION_ID}","MAIN.shm_records"]',
'value_type': 'FLOAT',
'units': 'eps',
'master_item_key': master,
'preprocessing': [
{
'type': 'JSONPATH',
'params': ['$[\'{#LOCATION_ID}.MAIN.shm_records\']'],
'error_handler': 'DISCARD_VALUE',
},
{
'type': 'CHANGE_PER_SECOND',
},
],
},
{
'id': 'item-prototype-1.160',
'name': 'MAIN.shm_flushes (SHM flushes due to overflow / sec)',
'type': 'DEPENDENT',
'key': 'varnish.stat["{#LOCATION_ID}","MAIN.shm_flushes"]',
'value_type': 'FLOAT',
'units': 'eps',
'master_item_key': master,
'preprocessing': [
{
'type': 'JSONPATH',
'params': ['$[\'{#LOCATION_ID}.MAIN.shm_flushes\']'],
'error_handler': 'DISCARD_VALUE',
},
{
'type': 'CHANGE_PER_SECOND',
},
],
},
{
'id': 'item-prototype-1.161',
'name': 'MAIN.shm_cont (SHM lock contention / sec)',
'type': 'DEPENDENT',
'key': 'varnish.stat["{#LOCATION_ID}","MAIN.shm_cont"]',
'value_type': 'FLOAT',
'units': 'eps',
'master_item_key': master,
'preprocessing': [
{
'type': 'JSONPATH',
'params': ['$[\'{#LOCATION_ID}.MAIN.shm_cont\']'],
'error_handler': 'DISCARD_VALUE',
},
{
'type': 'CHANGE_PER_SECOND',
},
],
},
{
'id': 'item-prototype-1.162',
'name': 'MAIN.shm_cycles (SHM cycles through VSL space / sec)',
'type': 'DEPENDENT',
'key': 'varnish.stat["{#LOCATION_ID}","MAIN.shm_cycles"]',
'value_type': 'FLOAT',
'units': 'eps',
'master_item_key': master,
'preprocessing': [
{
'type': 'JSONPATH',
'params': ['$[\'{#LOCATION_ID}.MAIN.shm_cycles\']'],
'error_handler': 'DISCARD_VALUE',
},
{
'type': 'CHANGE_PER_SECOND',
},
],
},
],
[
{
Expand Down
5 changes: 5 additions & 0 deletions zabbix-varnish-cache.py
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,11 @@
r'MAIN\.ws_client_overflow',
r'MAIN\.ws_session_overflow',
r'MAIN\.ws_thread_overflow',
# SHM: activity.
r'MAIN\.shm_records',
r'MAIN\.shm_flushes',
r'MAIN\.shm_cont',
r'MAIN\.shm_cycles',
# VHA6.
r'KVSTORE\.vha6_stats\..+\.(?:broadcast_candidates|broadcast_nocache|broadcast_skip|broadcast_lowttl|broadcast_toolarge|broadcasts|fetch_self|fetch_peer|fetch_peer_hit|fetch_origin|fetch_origin_deliver|fetch_peer_insert|error_version_mismatch|error_no_token|error_bad_token|error_stale_token|error_rate_limited|error_fetch|error_fetch_insert|error_fetch_seal|error_localhost|error_origin_mismatch|error_origin_miss|error_max_broadcasts|error_fetch_self|legacy_vha)',
# KVStore-based counters.
Expand Down

0 comments on commit c9b2ada

Please sign in to comment.