Skip to content

Commit bd08820

Browse files
dthalerdthaler
authored
Reorder columns on dashboard (#300)
Fixes #297 Signed-off-by: Dave Thaler <[email protected]>
1 parent d969d46 commit bd08820

File tree

1 file changed

+56
-56
lines changed

1 file changed

+56
-56
lines changed

‎OrcanodeMonitor/Pages/Index.cshtml

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
<tr>
1414
<th>Type</th>
1515
<th>Location</th>
16-
<th><a href="https://www.dataplicity.com/app/" target="_blank">Dataplicity</a></th>
17-
<th>Agent Version</th>
18-
<th>SD Card Util.</th>
19-
<th><a href="https://app.mezmo.com/313dbd82f3/logs/view" target="_blank">Mezmo</a></th>
16+
<th><a href="https://live.orcasound.net/listen" target="_blank">Orcasound</a></th>
2017
<th><a href="https://open.quiltdata.com/b/audio-orcasound-net/tree/" target="_blank">S3 Stream</a></th>
2118
<th>Up%</th>
2219
<th>dB</th>
23-
<th><a href="https://live.orcasound.net/listen" target="_blank">Orcasound</a></th>
2420
<th><a href="https://aifororcas2.azurewebsites.net/hydrophones" target="_blank">OrcaHello</a></th>
21+
<th><a href="https://app.mezmo.com/313dbd82f3/logs/view" target="_blank">Logging</a></th>
22+
<th><a href="https://www.dataplicity.com/app/" target="_blank">Dataplicity</a></th>
23+
<th>Agent Version</th>
24+
<th>SD Card Util.</th>
2525
</tr>
2626
@foreach (Models.Orcanode item in Model.Nodes)
2727
{
@@ -32,29 +32,17 @@
3232
<td title="@Html.DisplayFor(modelItem => item.DataplicityDescription)">
3333
@Html.DisplayFor(modelItem => item.DisplayName)
3434
</td>
35-
<td style="background-color: @Model.NodeDataplicityBackgroundColor(item)">
36-
<a asp-page="/DataplicityNode" asp-route-serial="@item.DataplicitySerial" style="color: @Model.NodeDataplicityTextColor(item)">
37-
@Html.DisplayFor(modelItem => item.DataplicityConnectionStatus)
38-
</a>
39-
</td>
40-
<td style="background-color: @Model.NodeDataplicityUpgradeColor(item)">
41-
@Html.DisplayFor(modelItem => item.AgentVersion)
42-
</td>
43-
<td>
44-
@Html.DisplayFor(modelItem => item.DiskUsedInGigs)/@Html.DisplayFor(modelItem => item.DiskCapacityInGigs)G
45-
(@Html.DisplayFor(modelItem => item.DiskUsagePercentage)%)
46-
</td>
47-
@if (item.MezmoStatus == Models.OrcanodeOnlineStatus.Absent)
35+
@if (item.OrcasoundStatus == Models.OrcanodeOnlineStatus.Absent)
4836
{
49-
<td style="background-color: @Model.NodeMezmoBackgroundColor(item); color: @Model.NodeMezmoTextColor(item)">
50-
@Html.DisplayFor(modelItem => item.MezmoStatus)
37+
<td style="background-color: @Model.NodeOrcasoundBackgroundColor(item); color: @Model.NodeOrcasoundTextColor(item)">
38+
@Html.DisplayFor(modelItem => item.OrcasoundStatus)
5139
</td>
5240
}
5341
else
5442
{
55-
<td style="background-color: @Model.NodeMezmoBackgroundColor(item)">
56-
<a href="https://app.mezmo.com/313dbd82f3/logs/view?hosts=@Html.DisplayFor(modelItem => item.S3NodeName)" style="color: @Model.NodeMezmoTextColor(item)" target="_blank">
57-
@Html.DisplayFor(modelItem => item.MezmoStatus)
43+
<td style="background-color: @Model.NodeOrcasoundBackgroundColor(item)">
44+
<a href="https://@Html.DisplayFor(modelItem => item.OrcasoundHost)/listen/@Html.DisplayFor(modelItem => item.OrcasoundSlug)" style="color: @Model.NodeOrcasoundTextColor(item)" target="_blank">
45+
@Html.DisplayFor(modelItem => item.OrcasoundStatus)
5846
</a>
5947
</td>
6048
}
@@ -73,42 +61,54 @@
7361
</td>
7462
}
7563
<td style="background-color: @Model.NodeUptimePercentageBackgroundColor(item)">
76-
<a asp-page="/NodeEvents" asp-route-id="@item.ID" style="color: @Model.NodeUptimePercentageTextColor(item)"
64+
<a asp-page="/NodeEvents" asp-route-id="@item.ID" style="color: @Model.NodeUptimePercentageTextColor(item)"
7765
aria-label="View events for @item.DisplayName">
7866
@Model.GetUptimePercentage(item)%
7967
</a>
8068
</td>
8169
<td>
8270
@Html.DisplayFor(modelItem => item.DecibelLevelForDisplay)
8371
</td>
84-
@if (item.OrcasoundStatus == Models.OrcanodeOnlineStatus.Absent)
72+
@if (item.OrcaHelloStatus == Models.OrcanodeOnlineStatus.Absent)
8573
{
86-
<td style="background-color: @Model.NodeOrcasoundBackgroundColor(item); color: @Model.NodeOrcasoundTextColor(item)">
87-
@Html.DisplayFor(modelItem => item.OrcasoundStatus)
74+
<td style="background-color: @Model.NodeOrcaHelloBackgroundColor(item); color: @Model.NodeOrcaHelloTextColor(item)">
75+
@Html.DisplayFor(modelItem => item.OrcaHelloStatus)
8876
</td>
8977
}
9078
else
9179
{
92-
<td style="background-color: @Model.NodeOrcasoundBackgroundColor(item)">
93-
<a href="https://@Html.DisplayFor(modelItem => item.OrcasoundHost)/listen/@Html.DisplayFor(modelItem => item.OrcasoundSlug)" style="color: @Model.NodeOrcasoundTextColor(item)" target="_blank">
94-
@Html.DisplayFor(modelItem => item.OrcasoundStatus)
80+
<td style="background-color: @Model.NodeOrcaHelloBackgroundColor(item)">
81+
<a href="https://aifororcas2.azurewebsites.net/hydrophones" style="color: @Model.NodeOrcaHelloTextColor(item)" target="_blank">
82+
@Html.DisplayFor(modelItem => item.OrcaHelloStatus)
9583
</a>
9684
</td>
9785
}
98-
@if (item.OrcaHelloStatus == Models.OrcanodeOnlineStatus.Absent)
86+
@if (item.MezmoStatus == Models.OrcanodeOnlineStatus.Absent)
9987
{
100-
<td style="background-color: @Model.NodeOrcaHelloBackgroundColor(item); color: @Model.NodeOrcaHelloTextColor(item)">
101-
@Html.DisplayFor(modelItem => item.OrcaHelloStatus)
88+
<td style="background-color: @Model.NodeMezmoBackgroundColor(item); color: @Model.NodeMezmoTextColor(item)">
89+
@Html.DisplayFor(modelItem => item.MezmoStatus)
10290
</td>
10391
}
10492
else
10593
{
106-
<td style="background-color: @Model.NodeOrcaHelloBackgroundColor(item)">
107-
<a href="https://aifororcas2.azurewebsites.net/hydrophones" style="color: @Model.NodeOrcaHelloTextColor(item)" target="_blank">
108-
@Html.DisplayFor(modelItem => item.OrcaHelloStatus)
94+
<td style="background-color: @Model.NodeMezmoBackgroundColor(item)">
95+
<a href="https://app.mezmo.com/313dbd82f3/logs/[email protected](modelItem => item.S3NodeName)" style="color: @Model.NodeMezmoTextColor(item)" target="_blank">
96+
@Html.DisplayFor(modelItem => item.MezmoStatus)
10997
</a>
11098
</td>
11199
}
100+
<td style="background-color: @Model.NodeDataplicityBackgroundColor(item)">
101+
<a asp-page="/DataplicityNode" asp-route-serial="@item.DataplicitySerial" style="color: @Model.NodeDataplicityTextColor(item)">
102+
@Html.DisplayFor(modelItem => item.DataplicityConnectionStatus)
103+
</a>
104+
</td>
105+
<td style="background-color: @Model.NodeDataplicityUpgradeColor(item)">
106+
@Html.DisplayFor(modelItem => item.AgentVersion)
107+
</td>
108+
<td>
109+
@Html.DisplayFor(modelItem => item.DiskUsedInGigs)/@Html.DisplayFor(modelItem => item.DiskCapacityInGigs)G
110+
(@Html.DisplayFor(modelItem => item.DiskUsagePercentage)%)
111+
</td>
112112
</tr>
113113
}
114114
</table>
@@ -128,25 +128,13 @@
128128
<b>Type Unknown</b>: The node type is unknown.
129129
</li>
130130
<li>
131-
<b>Dataplicity Absent</b>: Dataplicity does not know about the node.
132-
</li>
133-
<li>
134-
<b>Dataplicity Offline</b>: Dataplicity connection is down.
135-
</li>
136-
<li>
137-
<b>Dataplicity Online</b>: Dataplicity connection is up.
138-
</li>
139-
<li>
140-
<b>Mezmo Absent</b>: Mezmo does not know about the node.
141-
</li>
142-
<li>
143-
<b>Mezmo NoView</b>: Mezmo has no view configured for the node.
131+
<b>Orcasound Absent</b>: orcasound.net does not know about the node.
144132
</li>
145133
<li>
146-
<b>Mezmo Offline</b>: Mezmo has no recent log entries for the node.
134+
<b>Orcasound Hidden</b>: orcasound.net knows about but does not display the node.
147135
</li>
148136
<li>
149-
<b>Mezmo Online</b>: Mezmo is receiving recent log entries from the node.
137+
<b>Orcasound Online</b>: orcasound.net knows about the node.
150138
</li>
151139
<li>
152140
<b>S3 Stream Absent</b>: No latest.txt file exists on S3 for this node.
@@ -173,19 +161,31 @@
173161
<b>dB</b>: Maximum decibels other than hum.
174162
</li>
175163
<li>
176-
<b>Orcasound Absent</b>: orcasound.net does not know about the node.
164+
<b>OrcaHello Absent</b>: OrcaHello does not know about the node.
177165
</li>
178166
<li>
179-
<b>Orcasound Hidden</b>: orcasound.net knows about but does not display the node.
167+
<b>OrcaHello Online</b>: OrcaHello knows about the node.
180168
</li>
181169
<li>
182-
<b>Orcasound Online</b>: orcasound.net knows about the node.
170+
<b>Logging Absent</b>: Mezmo does not know about the node.
183171
</li>
184172
<li>
185-
<b>OrcaHello Absent</b>: OrcaHello does not know about the node.
173+
<b>Logging NoView</b>: Mezmo has no view configured for the node.
186174
</li>
187175
<li>
188-
<b>OrcaHello Online</b>: OrcaHello knows about the node.
176+
<b>Logging Offline</b>: Mezmo has no recent log entries for the node.
177+
</li>
178+
<li>
179+
<b>Logging Online</b>: Mezmo is receiving recent log entries from the node.
180+
</li>
181+
<li>
182+
<b>Dataplicity Absent</b>: Dataplicity does not know about the node.
183+
</li>
184+
<li>
185+
<b>Dataplicity Offline</b>: Dataplicity connection is down.
186+
</li>
187+
<li>
188+
<b>Dataplicity Online</b>: Dataplicity connection is up.
189189
</li>
190190
</ul>
191191
<p/>

0 commit comments

Comments
 (0)