From 2e85f9325a797977eea9dfea0a925775ddd211d9 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Feb 2021 12:49:00 +0100 Subject: Merging upstream version 1.29.0. Signed-off-by: Daniel Baumann --- .../python.d.plugin/litespeed/litespeed.chart.py | 24 ++++++++++------------ 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'collectors/python.d.plugin/litespeed/litespeed.chart.py') diff --git a/collectors/python.d.plugin/litespeed/litespeed.chart.py b/collectors/python.d.plugin/litespeed/litespeed.chart.py index 4b67ffb8a..7ef8189ea 100644 --- a/collectors/python.d.plugin/litespeed/litespeed.chart.py +++ b/collectors/python.d.plugin/litespeed/litespeed.chart.py @@ -1,30 +1,28 @@ # -*- coding: utf-8 -*- # Description: litespeed netdata python.d module -# Author: Ilya Maschenko (ilyam8) +# Author: Ilya Mashchenko (ilyam8) # SPDX-License-Identifier: GPL-3.0-or-later import glob -import re import os - +import re from collections import namedtuple from bases.FrameworkServices.SimpleService import SimpleService - update_every = 10 # charts order (can be overridden if you want less charts, or different order) ORDER = [ - 'net_throughput_http', # net throughput + 'net_throughput_http', # net throughput 'net_throughput_https', # net throughput - 'connections_http', # connections - 'connections_https', # connections - 'requests', # requests - 'requests_processing', # requests - 'pub_cache_hits', # cache - 'private_cache_hits', # cache - 'static_hits', # static + 'connections_http', # connections + 'connections_https', # connections + 'requests', # requests + 'requests_processing', # requests + 'pub_cache_hits', # cache + 'private_cache_hits', # cache + 'static_hits', # static ] CHARTS = { @@ -178,7 +176,7 @@ class Service(SimpleService): def parse_file(data, lines): for line in lines: - if not line.startswith(('BPS_IN:', 'MAXCONN:', 'REQ_RATE []:')): + if not line.startswith(('BPS_IN:', 'MAXCONN:', 'PLAINCONN:', 'REQ_RATE []:')): continue m = dict(RE.findall(line)) for v in T: -- cgit v1.2.3