Jcrespo has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391558 )

Change subject: Link to grafana rather than to ganglia on tendril
......................................................................

Link to grafana rather than to ganglia on tendril

Bug: T177225
Bug: T143896
Change-Id: I0aabf97db9460f235496ab075073b860e7702afd
---
M tpl/host/list.php
M tpl/host/view.php
2 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software/tendril 
refs/changes/58/391558/1

diff --git a/tpl/host/list.php b/tpl/host/list.php
index cc49aed..ea673fa 100644
--- a/tpl/host/list.php
+++ b/tpl/host/list.php
@@ -25,7 +25,7 @@
         </td>
         <td>
             <nav>
-                <a 
href="http://ganglia.wikimedia.org/latest/?r=day&cs=&ce=&m=cpu_report&s=by+name&c=MySQL+eqiad&h=&host_regex=&max_graphs=0&tab=m&vn=&hide-hf=false&sh=1&z=small&hc=4";>ganglia</a>
+                Grafana: [ <a 
href="https://grafana.wikimedia.org/dashboard/db/mysql-aggregated";>MySQL 
Aggregated</a> | <a 
href="https://grafana.wikimedia.org/dashboard/db/prometheus-cluster-breakdown?var-datasource=eqiad
 prometheus%2Fops&var-cluster=mysql&cluster=mysql">MySQL Prometheus cluster</a> 
]
             </nav>
         </td>
     </tr>
@@ -40,4 +40,4 @@
     <option value="slaves:">
     <option value="family:">
     <option value="slave-per-master">
-</datalist>
\ No newline at end of file
+</datalist>
diff --git a/tpl/host/view.php b/tpl/host/view.php
index f3d7b7b..b6416fd 100644
--- a/tpl/host/view.php
+++ b/tpl/host/view.php
@@ -50,7 +50,7 @@
 
 <div id="graphs-blurb">
     <nav style="display: inline-block;">
-        <a 
href="http://ganglia.wikimedia.org/latest/?r=hour&tab=ch&hreg[]=^<?= 
$host->name_short() ?>">ganglia</a>
+        grafana: [ <a 
href="https://grafana.wikimedia.org/dashboard/db/prometheus-cluster-breakdown?cluster=mysql&orgId=1&var-datasource=<?=
 preg_match('/^(db2|labsdb2|es2|pc2|dbstore2|dbproxy2)/', $host->name_short()) 
? 'codfw' : 'eqiad' ?>%20prometheus%2Fops&var-cluster=mysql&var-instance=<?= 
$host->name_short() ?>">Prometheus host metrics</a> | <a 
href="https://grafana.wikimedia.org/dashboard/db/mysql?&var-server=<?= 
$host->name_short() ?>&var-port=<?= $host->port == 3306 ? 9104 : $host->port + 
1000 ?>&var-dc=<?= preg_match('/^(db2|labsdb2|es2|pc2|dbstore2|dbproxy2)/', 
$host->name_short()) ? 'codfw' : 'eqiad' ?>">MySQL instance metrics</a> ]
         <a 
href="https://icinga.wikimedia.org/cgi-bin/icinga/status.cgi?host=<?= 
$host->name_short() ?>&nostatusheader">icinga</a>
     </nav>
 </div>

-- 
To view, visit https://gerrit.wikimedia.org/r/391558
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0aabf97db9460f235496ab075073b860e7702afd
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/tendril
Gerrit-Branch: master
Gerrit-Owner: Jcrespo <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to