Projet

Général

Profil

Révision 282b32b0

ID282b32b0e54a3bdfb19928f2b87f939fbedcb2bb
Parent 01edaf00
Enfant 0b4725d6

Ajouté par Olivier Mehani il y a environ 6 ans

[network/upnpc_] Add support for host_name

Signed-off-by: Olivier Mehani <>

Voir les différences:

plugins/network/upnpc_
27 27
  [upnpc*]
28 28
    env.traffic_remove_max true
29 29

  
30
You can display the graph on another host (e.g., the actual router) than the
31
one running upnpc. To do so, first configure the plugin to use a different
32
hostname.
33

  
34
    env.host_name router
35

  
36
Then configure munin (in /etc/munin/munin-conf or /etc/munin/munin-conf.d), to
37
support a new host.
38

  
39
  [example.net;router]
40
    address 127.0.0.1
41
    use_node_name no
42

  
30 43
=head1 AUTHOR
31 44

  
32 45
Olivier Mehani
......
62 75
		s/.*Packets.*/pkts/p; \
63 76
		s/.*uptime=.*/uptime/p; \
64 77
	")
65
HOST=$(echo "${DATA}" | sed -n "s#.*desc: http://\([^/:]\+\).*#\1#p")
78

  
79
HOST=${host_name:-}
80
HOST_TITLE=""
81
HOST_NAME="host_name ${HOST}"
82
if [ -z "${HOST}" ]; then
83
	HOST=$(echo "${DATA}" | sed -n "s#.*desc: http://\([^/:]\+\).*#\1#p")
84
	# Only add the host name to the title if autodetected
85
	HOST_TITLE=" ($HOST)"
86
	# ...but not as a separate host
87
	HOST_NAME=""
88
fi
66 89

  
67 90
autoconf() {
68 91
	test -n "${DATA}" && echo yes || echo "no (No UPnP router detected)"
......
80 103
	case ${1} in
81 104
		"uptime")
82 105
			cat << EOF
83
graph_title Uplink connection uptime (${HOST})
106
graph_title Uplink connection uptime${HOST_TITLE}
84 107
graph_args -l 0
85 108
graph_category network
86 109
graph_scale no
......
88 111
uptime.label uptime
89 112
uptime.draw AREA
90 113
uptime.cdef uptime,3600,/
114
${HOST_NAME}
91 115
EOF
92 116
			;;
93 117
		"bitrate")
94 118
			cat << EOF
95
graph_title [DEPRECATED] Uplink bitrate (${HOST})
119
graph_title [DEPRECATED] Uplink bitrate${HOST_TITLE}
96 120
graph_args --base 1000 -l 0
97 121
graph_category network
98 122
graph_vlabel bitrate down (-) / up (+)
......
100 124
up.label bps
101 125
down.graph no
102 126
up.negative down
127
${HOST_NAME}
103 128
EOF
104 129
			;;
105 130
		"traffic")
106 131
			cat << EOF
107
graph_title Uplink traffic (${HOST})
132
graph_title Uplink traffic${HOST_TITLE}
108 133
graph_args --base 1000 -l 0
109 134
graph_category network
110 135
EOF
......
127 152
up.cdef up,8,*
128 153
down.graph no
129 154
up.negative down
155
${HOST_NAME}
130 156
EOF
131 157
			;;
132 158
		"pkts")
133 159
			# ${graph_period} is not a shell variable
134 160
			cat << EOF
135
graph_title Uplink packets (${HOST})
161
graph_title Uplink packets${HOST_TITLE}
136 162
graph_args --base 1000 -l 0
137 163
graph_category network
138 164
EOF
......
148 174
up.min 0
149 175
down.graph no
150 176
up.negative down
177
${HOST_NAME}
151 178
EOF
152 179
			;;
153 180
		"multi"|"upnpc")
181
			echo "${HOST_NAME}"
182
			# Don't repeat HOST_NAME in sub-configs
183
			HOST_NAME=""
154 184
			echo "multigraph ${PLUGIN_NAME}"
155 185
			config "traffic"
156 186
			for mode in ${SUPPORTED_MODES}; do

Formats disponibles : Unified diff