Changeset 42276 for trunk/ippMonitor

Timestamp:

Sep 2, 2022, 11:11:31 AM (4 years ago)

Author:

cclin33

Message:

ccl: update links in storage part

Location:

trunk/ippMonitor/raw

Files:

• czartool_labels.php (modified) (4 diffs)
• ipp.czar.dat (modified) (1 diff)
• storage.php (modified) (2 diffs)

trunk/ippMonitor/raw/czartool_labels.php

@@ -208 +208 @@
 $svnlink = "https://svn.pan-starrs.ifa.hawaii.edu/trac/ipp";
 $conflink = "https://panstarrs.atlassian.net";
-$jiralink = "https://panstarrs.atlassian.net";
 $hsttime1 = date("Y-m-d H:i:s", strtotime("$lastUpdateTime"));
 $utctime1 = gmdate("Y-m-d H:i:s", strtotime("$lastUpdateTime"));
@@ -242 +241 @@
 echo "<tr><td>Documentations for IPP</td>
           <td><a href=\"$conflink/wiki/spaces/IPPCZAR/pages/679903282/Czarblog+Roll\" target=new><font color=\"blue\">Czarblog</font></a>
-  &nbsp|&nbsp <a href=\"$conflink/wiki/spaces/IPPCZAR/overview\" target=new><font color=\"blue\">Confluence</font></a>
-  &nbsp|&nbsp <a href=\"$jiralink/issues/?filter=-4\" target=new><font color=\"blue\">Jira</font></a>
+  &nbsp|&nbsp <a href=\"$conflink/wiki/spaces/IPPCZAR/pages/678634250/Czar+Guidelines\" target=new><font color=\"blue\">Czar guidelines</font></a>
+  &nbsp|&nbsp <a href=\"$conflink/browse/IPP-86\" target=new><font color=\"blue\">ippMonitor Jira</font></a> 
+  &nbsp|&nbsp <a href=\"$conflink/wiki/spaces/IKB/pages/678298859/IPP+Hardware+Status\" target=new><font color=\"blue\">Hardware</font></a> 
   &nbsp|&nbsp <a href=\"$svnlink/\" target=new><font color=\"blue\">trac</font></a>
-  &nbsp|&nbsp <a href=\"$jiralink/browse/IPP-86\" target=new><font color=\"blue\">Jira-ippMonitor</font></a> 
   </td></tr>";
 echo "<tr><td>Current nightly science status</td> 
@@ -1616 +1615 @@
     echo "    <div style=\"font-size: 12px; height: 14px; border: 1px solid; background-color: #bbbbbb\"><center>Down | Repair</div>";
     echo "    <div style=\"font-size: 12px; height: 14px; border: 1px solid; background-color: #ffffff\"><center>Power Off</div>";
-    echo "    <div style=\"font-size: 12px; height: 14px; border: 1px solid; background-color: #ffffff\"><center>
-                 <a href=\"https://confluence.ipp.ifa.hawaii.edu/display/IKB/IPP+Hardware+Status#IPPHardwareStatus-StorageNodes\" target=new><font color=\"blue\">Notes</font></a></div>";
     echo "  </div>";
     echo "</div>";
@@ -1630 +1627 @@
     echo "     'free', {type: 'string', role: 'style'}, {type: 'string', role: 'tooltip', 'p': {'html': true}}],";
 
-    $sql = "SELECT host, format(total,1), format(available,2), format(used,2), writable, readable, format(used/total*100,2) FROM hosts";
+    $sql = "SELECT host, format(total,1), format(available,2), format(used,2), writable, readable, format(used/total*100,2) FROM hosts order by host";
     if ($debug) {echo "$sql<br>";}
     $qry = $db->query($sql);

trunk/ippMonitor/raw/ipp.czar.dat

@@ -4 +4 @@
 
 menulink   | menuselect      | link    | czartool               | czartool_labels.php
-menulink   | menuselect      | link    | storage only           | storage.php
+menulink   | menuselect      | link    | storage status         | storage.php
 menulink   | menuselect      | link    | mask stats             | maskStats.php
 menulink   | menuselect      | link    | night summary          | nightSummary.php

trunk/ippMonitor/raw/storage.php

@@ -65 +65 @@
     echo "    <div style=\"font-size: 12px; height: 14px; border: 1px solid; background-color: #bbbbbb\"><center>Down | Repair</div>";
     echo "    <div style=\"font-size: 12px; height: 14px; border: 1px solid; background-color: #ffffff\"><center>Power Off</div>";
-    echo "    <div style=\"font-size: 12px; height: 14px; border: 1px solid; background-color: #ffffff\"><center>
-                 <a href=\"https://confluence.ipp.ifa.hawaii.edu/display/IKB/IPP+Hardware+Status#IPPHardwareStatus-StorageNodes\" target=new><font color=\"blue\">Notes</font></a></div>";
     echo "  </div>";
     echo "</div>";
@@ -79 +77 @@
     echo "     'free', {type: 'string', role: 'style'}, {type: 'string', role: 'tooltip', 'p': {'html': true}}],";
 
-    $sql = "SELECT host, format(total,1), format(available,2), format(used,2), writable, readable, format(used/total*100,2) FROM hosts";
+    $sql = "SELECT host, format(total,1), format(available,2), format(used,2), writable, readable, format(used/total*100,2) FROM hosts order by host";
     if ($debug) {echo "$sql<br>";}
     $qry = $db->query($sql);