Ema has submitted this change and it was merged. Change subject: varnish: add varnishstat dstat plugin ......................................................................
varnish: add varnishstat dstat plugin dstat_varnishstat is a plugin for dstat allowing to display varnish statistics in dstat. Usage: dstat --varnishstat Change-Id: Ib6fccf6224b3a6408d5caf46ac7be470e30fb813 --- A modules/varnish/files/dstat_varnishstat.py M modules/varnish/manifests/common.pp 2 files changed, 125 insertions(+), 0 deletions(-) Approvals: Ema: Verified; Looks good to me, approved diff --git a/modules/varnish/files/dstat_varnishstat.py b/modules/varnish/files/dstat_varnishstat.py new file mode 100644 index 0000000..e4fd716 --- /dev/null +++ b/modules/varnish/files/dstat_varnishstat.py @@ -0,0 +1,110 @@ +""" +Display varnish statistics in dstat + +Usage: dstat --varnishstat + + Copyright 2016 Emanuele Rocca <e...@wikimedia.org> + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import os + +counters = ( + ("fe-n_object", "f_nobj"), + ("fe-n_lru_nuked", "f_nlru"), + ("fe-backend_fail", "f_bfail"), + ("be-n_object", "b_nobj"), + ("be-n_lru_nuked", "b_nlru"), + ("be-backend_fail", "b_bfail"), + ("fe-threads", "f_thr"), + ("fe-threads_created", "f_thc"), + ("be-threads", "b_thr"), + ("be-threads_created", "b_thc"), + ("fe-exp-lag", "f_exlag"), + ("be-exp-lag", "b_exlag"), +) + + +class dstat_plugin(dstat): # noqa F821 undefined name 'dstat' + + def __init__(self): + global counters + self.name = "varnishstat" + self.vars = [i[0] for i in counters] + self.nick = [i[1] for i in counters] + self.type = "d" + + def check(self): + if os.system("varnishstat -1 > /dev/null") != 0: + raise Exception("Non-zero exit code from varnishstat") + + def version(self): + cmd = os.popen("""varnishstat -V 2>&1 | + awk 'NR==1 { print $2 }' | + tr -d '(' + """) + return cmd.readline().rstrip() + + def varnishstat(self, frontend=False): + if "varnish-4" in self.version(): + cmd = ("varnishstat -1 -f MAIN.n_object -f MAIN.n_lru_nuked " + "-f MAIN.backend_fail -f MAIN.threads " + "-f MAIN.threads_created " + "-f MAIN.exp_mailed -f MAIN.exp_received") + else: + cmd = ("varnishstat -1 -f n_object -f n_lru_nuked " + "-f backend_fail -f n_wrk -f n_wrk_create") + + if frontend: + cmd += " -n frontend" + label = "fe" + else: + label = "be" + + data = os.popen(cmd) + total = {} + for line in data.readlines(): + row = line.split() + if not row: + continue + + item = "%s-%s" % (label, row[0].replace("MAIN.", "")) + value = float(row[1]) + total[item] = value + + if "varnish-3" in self.version(): + total["fe-threads_created"] = total.get("fe-n_wrk_create", 0) + total["be-threads_created"] = total.get("be-n_wrk_create", 0) + total["fe-threads"] = total.get("fe-n_wrk", 0) + total["be-threads"] = total.get("be-n_wrk", 0) + + # Expiry mailbox lag + total["fe-exp-lag"] = total.get("fe-exp_mailed", 0) - \ + total.get("fe-exp_received", 0) + total["be-exp-lag"] = total.get("be-exp_mailed", 0) - \ + total.get("be-exp_received", 0) + + return total + + def extract(self): + fields = ("n_object", "n_lru_nuked", "backend_fail", "threads", + "threads_created", "exp-lag") + be_values = self.varnishstat(frontend=False) + + fe_values = self.varnishstat(frontend=True) + + for field in fields: + self.val["fe-" + field] = fe_values.get("fe-" + field, 0) + self.val["be-" + field] = be_values.get("be-" + field, 0) diff --git a/modules/varnish/manifests/common.pp b/modules/varnish/manifests/common.pp index 7173649..0b37f8d 100644 --- a/modules/varnish/manifests/common.pp +++ b/modules/varnish/manifests/common.pp @@ -41,6 +41,21 @@ source => 'puppet:///modules/varnish/varnish-frontend-restart', } + file { '/usr/local/share/dstat': + ensure => directory, + owner => 'root', + group => 'root', + mode => '0755', + } + + file { '/usr/local/share/dstat/dstat_varnishstat.py': + owner => 'root', + group => 'root', + mode => '0444', + source => 'puppet:///modules/varnish/dstat_varnishstat.py', + require => File['/usr/local/share/dstat'], + } + # `vlogdump` is a small tool to filter the output of varnishlog # See <https://github.com/cosimo/vlogdump> for more. file { '/usr/local/bin/vlogdump': -- To view, visit https://gerrit.wikimedia.org/r/314247 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib6fccf6224b3a6408d5caf46ac7be470e30fb813 Gerrit-PatchSet: 8 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ema <e...@wikimedia.org> Gerrit-Reviewer: BBlack <bbl...@wikimedia.org> Gerrit-Reviewer: Ema <e...@wikimedia.org> Gerrit-Reviewer: Volans <rcocci...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
