diff --git a/checkpoint_fw_connections.mkp b/checkpoint_fw_connections.mkp index afc083ea8e955bebb15236d37f1a9582715a6426..55f0fb181169aecd8bc35109f729c00c7e1e24fc 100644 Binary files a/checkpoint_fw_connections.mkp and b/checkpoint_fw_connections.mkp differ diff --git a/checks/checkpoint_fw_connections b/checks/checkpoint_fw_connections index da95794aa54a8b6c64da7be6cb256ebab6a18a05..459d333c1378721e11b9a161163b7d4fb07a2480 100644 --- a/checks/checkpoint_fw_connections +++ b/checks/checkpoint_fw_connections @@ -21,7 +21,7 @@ # factory_settings['checkpoint_fw_connections_defaults'] = { - # 'warncritconcurrent': (1000, 2000), + # 'warncritcurrent': (1000, 2000), # 'warncritnew': (100, 200) } @@ -61,7 +61,7 @@ def check_checkpoint_fw_connections(item, params, info): ] for info, unit, counter, value, warncrit in [ - ('current: ', '', 'fwcurrnetnumconn', fwCurrnetNumConn, 'warncritconcurrent'), + ('current: ', '', 'fwcurrentnumconn', fwCurrnetNumConn, 'warncritcurrent'), ('rate: ', '/s', 'fwconnectionrate', fwConnectionRate, 'warncritrate') ]: if params.get(warncrit): diff --git a/web/plugins/metrics/checkpoint_fw_connections.py b/web/plugins/metrics/checkpoint_fw_connections.py index 9df7757e3996a53e1cb80050d386fec3efe809d5..d14cfb0cd88d55c146a0b0784822c01a6b1c0097 100644 --- a/web/plugins/metrics/checkpoint_fw_connections.py +++ b/web/plugins/metrics/checkpoint_fw_connections.py @@ -31,7 +31,7 @@ metric_info['checkpoint_fw_connections_fwconnectionstcp'] = { metric_info['checkpoint_fw_connections_fwconnectionsudp'] = { 'title': _('UDP connections'), 'unit': '1/s', - 'color': '21/a', + 'color': '14/a', } metric_info['checkpoint_fw_connections_fwconnectionsicmp'] = { 'title': _('ICMP connections'), @@ -41,7 +41,7 @@ metric_info['checkpoint_fw_connections_fwconnectionsicmp'] = { metric_info['checkpoint_fw_connections_fwconnectionsother'] = { 'title': _('Other connections'), 'unit': '1/s', - 'color': '41/a', + 'color': '34/a', } metric_info['checkpoint_fw_connections_fwconnectionssum'] = { 'title': _('Total connections'), @@ -51,7 +51,7 @@ metric_info['checkpoint_fw_connections_fwconnectionssum'] = { metric_info['checkpoint_fw_connections_fwconnectionrate'] = { 'title': _('Connections rate'), 'unit': '1/s', - 'color': '42/a', + 'color': '22/a', } metric_info['checkpoint_fw_connections_fwcurrentnumconn'] = { @@ -62,7 +62,7 @@ metric_info['checkpoint_fw_connections_fwcurrentnumconn'] = { metric_info['checkpoint_fw_connections_fwpeaknumconn'] = { 'title': _('Peak Connections'), 'unit': 'count', - 'color': '23/a', + 'color': '13/a', } @@ -131,8 +131,8 @@ perfometer_info.append(('stacked', [ }, { 'type': 'logarithmic', - 'metric': 'checkpoint_fw_connections_fwconnectionssum', + 'metric': 'checkpoint_fw_connections_fwconnectionrate', 'half_value': 1000.0, 'exponent': 2, }, -])) +])) \ No newline at end of file diff --git a/web/plugins/wato/checkpoint_fw_connections.py b/web/plugins/wato/checkpoint_fw_connections.py index bc646da611366a6f4e1e65fb00bbcab5a74c4491..5fd7be04d5284195a5d113a59c96ed601095d03b 100644 --- a/web/plugins/wato/checkpoint_fw_connections.py +++ b/web/plugins/wato/checkpoint_fw_connections.py @@ -13,9 +13,9 @@ register_check_parameters( _('Check Point Firewall Connections'), Dictionary( elements=[ - ('warncritconcurrent', + ('warncritcurrent', Tuple( - title=_('Levels for number of concurrent active connections'), + title=_('Levels for number of current active connections'), elements=[ Integer(title=_('Warning at'), default_value=1000, unit=_('Count'), allow_empty=False), Integer(title=_('Critical at'), default_value=2000, unit=_('Count'), allow_empty=False),