Skip to content

Commit 7d5c114

Browse files
leolovenetleolovenet
committed
1. changed arguments from decode() in base.py, so they can run under CentOS 6.8 with Python 2.6
2. added pass parameters to redis for AUTH command 3. optimized nginx.chart.py and phpfpm.chart.py webpages submenu name 4. optimized phpfpm.chart.py average display
1 parent c335489 commit 7d5c114

4 files changed

Lines changed: 270 additions & 148 deletions

File tree

‎python.d/nginx.chart.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,24 @@
2222

2323
CHARTS = {
2424
'connections': {
25-
'options': [None, 'nginx Active Connections', 'connections', 'Active Connections', 'nginx.connections', 'line'],
25+
'options': [None, 'nginx Active Connections', 'connections', 'active connections', 'nginx.connections', 'line'],
2626
'lines': [
2727
["active"]
2828
]},
2929
'requests': {
30-
'options': [None, 'nginx Requests', 'requests/s', 'Requests', 'nginx.requests', 'line'],
30+
'options': [None, 'nginx Requests', 'requests/s', 'requests', 'nginx.requests', 'line'],
3131
'lines': [
3232
["requests", None, 'incremental']
3333
]},
3434
'connection_status': {
35-
'options': [None, 'nginx Active Connections by Status', 'connections', 'Active Connection Status', 'nginx.connection_status', 'line'],
35+
'options': [None, 'nginx Active Connections by Status', 'connections', 'status', 'nginx.connection_status', 'line'],
3636
'lines': [
3737
["reading"],
3838
["writing"],
3939
["waiting", "idle"]
4040
]},
4141
'connect_rate': {
42-
'options': [None, 'nginx Connections Rate', 'connections/s', 'Connections Rate', 'nginx.connect_rate', 'line'],
42+
'options': [None, 'nginx Connections Rate', 'connections/s', 'connections rate', 'nginx.connect_rate', 'line'],
4343
'lines': [
4444
["accepts", "accepted", "incremental"],
4545
["handled", None, "incremental"]

‎python.d/phpfpm.chart.py‎

100644100755
Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,37 +23,37 @@
2323

2424
CHARTS = {
2525
'connections': {
26-
'options': [None, 'PHP-FPM Active Connections', 'connections', 'Active Connections', 'phpfpm.connections', 'line'],
26+
'options': [None, 'PHP-FPM Active Connections', 'connections', 'active connections', 'phpfpm.connections', 'line'],
2727
'lines': [
2828
["active"],
2929
["maxActive", 'max active'],
3030
["idle"]
3131
]},
3232
'requests': {
33-
'options': [None, 'PHP-FPM Requests', 'requests/s', 'Requests', 'phpfpm.requests', 'line'],
33+
'options': [None, 'PHP-FPM Requests', 'requests/s', 'requests', 'phpfpm.requests', 'line'],
3434
'lines': [
3535
["requests", None, "incremental"]
3636
]},
3737
'performance': {
38-
'options': [None, 'PHP-FPM Performance', 'status', 'Performance', 'phpfpm.performance', 'line'],
38+
'options': [None, 'PHP-FPM Performance', 'status', 'performance', 'phpfpm.performance', 'line'],
3939
'lines': [
4040
["reached", 'max children reached'],
4141
["slow", 'slow requests']
4242
]},
4343
'request_duration': {
44-
'options': [None, 'PHP-FPM Request Duration', 'milliseconds', 'Request Duration', 'phpfpm.request_duration', 'line'],
44+
'options': [None, 'PHP-FPM Request Duration', 'milliseconds', 'request duration', 'phpfpm.request_duration', 'line'],
4545
'lines': [
4646
["maxReqDur", 'max request duration'],
4747
["avgReqDur", 'average request duration']
4848
]},
4949
'request_cpu': {
50-
'options': [None, 'PHP-FPM Request CPU', 'percent', 'Request CPU', 'phpfpm.request_cpu', 'line'],
50+
'options': [None, 'PHP-FPM Request CPU', 'percent', 'request CPU', 'phpfpm.request_cpu', 'line'],
5151
'lines': [
5252
["maxReqCPU", 'max request cpu'],
5353
["avgReqCPU", 'average request cpu']
5454
]},
5555
'request_mem': {
56-
'options': [None, 'PHP-FPM Request Memory', 'kilobytes', 'Request Memory', 'phpfpm.request_mem', 'line'],
56+
'options': [None, 'PHP-FPM Request Memory', 'kilobytes', 'request memory', 'phpfpm.request_mem', 'line'],
5757
'lines': [
5858
["maxReqMem", 'max request memory'],
5959
["avgReqMem", 'average request memory']
@@ -137,6 +137,3 @@ def _get_data(self):
137137
if len(data) == 0:
138138
return None
139139
return data
140-
141-
def check(self):
142-
return UrlService.check(self)

0 commit comments

Comments
 (0)