378KlzPrDEAZL5An9ro9gh changeset

Changeset636532383338 (b)
Parent306563623763 (a)
ab
1414... will monitor http response times to http://192.168.0.10/
1515
1616If you wish to monitor the http response time to a particular page, use the
...
17-/etc/munin/plugin-conf.d/munin-node configuration file and add the following
17+/etc/munin/plugin-conf.d/munin-node CONFIGuration file and add the following
...
1818section:
1919
2020[response_time_http*]
...
3333from timeit import Timer
3434
3535
...
36-usage = """\
36+USAGE = """\
...
3737To use this plugin, you must create a symbolic link to it,
3838with the ip address or fqdn of the web server to monitor.
3939
...
4242ln -s /usr/share/node/node/plugins-auto/response_time_http_ \
4343/etc/munin/node.d/response_time_http_192.168.0.10"""
4444
...
45-config = """\
45+CONFIG = """\
...
4646graph_title HTTP GET response time for %s
4747graph_vlabel seconds
4848ping_http.label response time
...
6464    address = os.path.basename(argv[0]).replace('response_time_http_', '')
6565
6666    if not address:
...
67-        print(usage)
67+        print(USAGE)
...
6868        return 1
6969
7070    if 'config' in sys.argv:
...
71-        print(config % address)
71+        print(CONFIG % address)
...
7272    else:
7373        runs = 10
7474        if 'runs' in os.environ:
...
75-            pings = os.environ['runs']
75+            runs = os.environ['runs']
75+        runs = int(runs)
...
7676
7777        timeout = 5
7878        if 'timeout' in os.environ:
...
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
--- Revision 306563623763
+++ Revision 636532383338
@@ -15,7 +15,7 @@
 ... will monitor http response times to http://192.168.0.10/
 
 If you wish to monitor the http response time to a particular page, use the
-/etc/munin/plugin-conf.d/munin-node configuration file and add the following 
+/etc/munin/plugin-conf.d/munin-node CONFIGuration file and add the following 
 section:
 
 [response_time_http*]
@@ -34,7 +34,7 @@
 from timeit import Timer
 
 
-usage = """\
+USAGE = """\
 To use this plugin, you must create a symbolic link to it,
 with the ip address or fqdn of the web server to monitor.
 
@@ -43,7 +43,7 @@
 ln -s /usr/share/node/node/plugins-auto/response_time_http_ \
 /etc/munin/node.d/response_time_http_192.168.0.10"""
 
-config = """\
+CONFIG = """\
 graph_title HTTP GET response time for %s
 graph_vlabel seconds
 ping_http.label response time
@@ -65,15 +65,16 @@
     address = os.path.basename(argv[0]).replace('response_time_http_', '')
 
     if not address:
-        print(usage)
+        print(USAGE)
         return 1
 
     if 'config' in sys.argv:
-        print(config % address)
+        print(CONFIG % address)
     else:
         runs = 10
         if 'runs' in os.environ:
-            pings = os.environ['runs']
+            runs = os.environ['runs']
+        runs = int(runs)
 
         timeout = 5
         if 'timeout' in os.environ: