Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2f4cb05f67 | ||
|
|
fa108b2a1e | ||
|
|
ff425dbaee | ||
|
|
99dee62098 | ||
|
|
4ad331ddfe |
No files matched your search
@@ -92,7 +92,7 @@ Two processes share a MariaDB database:
|
|||||||
|
|
||||||
| Host | Prometheus Instance |
|
| Host | Prometheus Instance |
|
||||||
|---|---|
|
|---|---|
|
||||||
| large1 | 10.10.10.2:9100 |
|
| compute-storage-02 | 10.10.10.2:9100 |
|
||||||
| compute-storage-01 | 10.10.10.4:9100 |
|
| compute-storage-01 | 10.10.10.4:9100 |
|
||||||
| monitor-01 | 10.10.10.8:9100 |
|
| monitor-01 | 10.10.10.8:9100 |
|
||||||
| monitor-02 | 10.10.10.9:9100 |
|
| monitor-02 | 10.10.10.9:9100 |
|
||||||
@@ -136,7 +136,7 @@ holds every page and Start maintenance.
|
|||||||
Every alert Gandalf raised in the last 24 hours to 90 days, including ones that cleared before anyone
|
Every alert Gandalf raised in the last 24 hours to 90 days, including ones that cleared before anyone
|
||||||
saw them: when each started, how long it lasted, failed checks, and its ticket.
|
saw them: when each started, how long it lasted, failed checks, and its ticket.
|
||||||
- Filter by device (name, port or interface), alert type, severity, and open or cleared. Filters are
|
- Filter by device (name, port or interface), alert type, severity, and open or cleared. Filters are
|
||||||
kept in the URL, so `/events?target=large1&range=90d` is a shareable link; device pages and tickets
|
kept in the URL, so `/events?target=compute-storage-02&range=90d` is a shareable link; device pages and tickets
|
||||||
link to their own history this way.
|
link to their own history this way.
|
||||||
- **Recurring** lists the same alert on the same target more than once in the range, worst first, since
|
- **Recurring** lists the same alert on the same target more than once in the range, worst first, since
|
||||||
a flapping cable or optic shows up here before anyone notices the tickets.
|
a flapping cable or optic shows up here before anyone notices the tickets.
|
||||||
@@ -227,7 +227,7 @@ servers along the bottom. Power gear (PDU, UPS, power strip) sits in a rail on t
|
|||||||
named "Patch panel port 1" (the device beyond the panel is unknown); a stub that already has a name
|
named "Patch panel port 1" (the device beyond the panel is unknown); a stub that already has a name
|
||||||
keeps it and adds "via Patch panel port 2". The cable details show where the cutsheet cable goes.
|
keeps it and adds "via Patch panel port 2". The cable details show where the cutsheet cable goes.
|
||||||
- **Port names**: a ⚠ marks a port named after one device with a different one plugged in (a port
|
- **Port names**: a ⚠ marks a port named after one device with a different one plugged in (a port
|
||||||
called "Large1 Management" with the AP on it). Generic names ("Port 4", "SFP+ 2", "Uplink") and
|
called "compute-storage-02 Management" with the AP on it). Generic names ("Port 4", "SFP+ 2", "Uplink") and
|
||||||
"Downlink to X" with X on the other end never flag.
|
"Downlink to X" with X on the other end never flag.
|
||||||
- **Alerts**: a device with active alerts (not suppressed) gets a ring and a count in its worst
|
- **Alerts**: a device with active alerts (not suppressed) gets a ring and a count in its worst
|
||||||
severity colour, and the NIC it is about is marked.
|
severity colour, and the NIC it is about is marked.
|
||||||
@@ -588,7 +588,7 @@ Shared by both processes. Located in the working directory (`/var/www/html/prod/
|
|||||||
"trusted_proxies": ["10.10.10.27"]
|
"trusted_proxies": ["10.10.10.27"]
|
||||||
},
|
},
|
||||||
"hosts": [
|
"hosts": [
|
||||||
{ "name": "large1", "prometheus_instance": "10.10.10.2:9100" },
|
{ "name": "compute-storage-02", "prometheus_instance": "10.10.10.2:9100" },
|
||||||
{ "name": "compute-storage-01", "prometheus_instance": "10.10.10.4:9100" },
|
{ "name": "compute-storage-01", "prometheus_instance": "10.10.10.4:9100" },
|
||||||
{ "name": "monitor-01", "prometheus_instance": "10.10.10.8:9100" },
|
{ "name": "monitor-01", "prometheus_instance": "10.10.10.8:9100" },
|
||||||
{ "name": "monitor-02", "prometheus_instance": "10.10.10.9:9100" },
|
{ "name": "monitor-02", "prometheus_instance": "10.10.10.9:9100" },
|
||||||
|
|||||||
+1
-1
@@ -914,7 +914,7 @@ class LinkStatsCollector:
|
|||||||
"""
|
"""
|
||||||
Collect full link stats for all Prometheus-monitored hosts.
|
Collect full link stats for all Prometheus-monitored hosts.
|
||||||
|
|
||||||
*instance_map*: ``{'10.10.10.2:9100': 'large1', ...}``
|
*instance_map*: ``{'10.10.10.2:9100': 'compute-storage-02', ...}``
|
||||||
|
|
||||||
Returns a dict suitable for ``db.set_state('link_stats', ...)``.
|
Returns a dict suitable for ``db.set_state('link_stats', ...)``.
|
||||||
"""
|
"""
|
||||||
|
|||||||
+1
-1
@@ -290,7 +290,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="lt-form-group" id="sup-name-group">
|
<div class="lt-form-group" id="sup-name-group">
|
||||||
<label class="lt-label" for="sup-name">Target Name</label>
|
<label class="lt-label" for="sup-name">Target Name</label>
|
||||||
<input type="text" class="lt-input" id="sup-name" name="target_name" placeholder="e.g. large1">
|
<input type="text" class="lt-input" id="sup-name" name="target_name" placeholder="e.g. compute-storage-02">
|
||||||
</div>
|
</div>
|
||||||
<div class="lt-form-group" id="sup-detail-group" style="display:none">
|
<div class="lt-form-group" id="sup-detail-group" style="display:none">
|
||||||
<label class="lt-label" for="sup-detail">Interface <span class="lt-field-hint">(interface type only)</span></label>
|
<label class="lt-label" for="sup-detail">Interface <span class="lt-field-hint">(interface type only)</span></label>
|
||||||
|
|||||||
@@ -50,7 +50,7 @@
|
|||||||
<div class="lt-form-group form-group-wide">
|
<div class="lt-form-group form-group-wide">
|
||||||
<label class="lt-label" for="s-reason">Reason <span class="required">*</span></label>
|
<label class="lt-label" for="s-reason">Reason <span class="required">*</span></label>
|
||||||
<input type="text" class="lt-input" id="s-reason" name="reason"
|
<input type="text" class="lt-input" id="s-reason" name="reason"
|
||||||
placeholder="e.g. Planned switch maintenance, replacing SFP on large1/enp43s0"
|
placeholder="e.g. Planned switch maintenance, replacing SFP on compute-storage-02/enp43s0"
|
||||||
required aria-required="true">
|
required aria-required="true">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
+1
-1
@@ -62,7 +62,7 @@ def link(text: str, url: str) -> str:
|
|||||||
|
|
||||||
|
|
||||||
def port_text(switch: str, port_name: str, port: dict) -> str:
|
def port_text(switch: str, port_name: str, port: dict) -> str:
|
||||||
"""'8SFP-AGG port 7 "Large1": up at 10 Gbps, DAC'"""
|
"""'8SFP-AGG port 7 "compute-storage-02": up at 10 Gbps, DAC'"""
|
||||||
idx = port.get('port_idx')
|
idx = port.get('port_idx')
|
||||||
text = f'{switch} port {idx}' if idx is not None else f'{switch} {port_name}'
|
text = f'{switch} port {idx}' if idx is not None else f'{switch} {port_name}'
|
||||||
if port_name and idx is not None and port_name != f'Port {idx}':
|
if port_name and idx is not None and port_name != f'Port {idx}':
|
||||||
|
|||||||
+2
-2
@@ -25,7 +25,7 @@ _TOKEN_RE = re.compile(r'[a-z0-9]+')
|
|||||||
|
|
||||||
|
|
||||||
def _norm(name: str) -> str:
|
def _norm(name: str) -> str:
|
||||||
"""A name with case, spaces, dashes and underscores ignored: "Large1" == "large-1"."""
|
"""A name with case, spaces, dashes and underscores ignored: "Storage-01" == "storage_01"."""
|
||||||
return ''.join(_TOKEN_RE.findall((name or '').lower()))
|
return ''.join(_TOKEN_RE.findall((name or '').lower()))
|
||||||
|
|
||||||
|
|
||||||
@@ -114,7 +114,7 @@ def name_mismatch(port_name: str, neighbour: str, own: str, known: Dict[str, str
|
|||||||
"""A port named after a different device than the one plugged into it.
|
"""A port named after a different device than the one plugged into it.
|
||||||
|
|
||||||
known: {normalised name: display name} of every device. Runs of up to four words of
|
known: {normalised name: display name} of every device. Runs of up to four words of
|
||||||
the port name are compared with them, so "Large1 Management" names large1 and
|
the port name are compared with them, so "Storage-01 Management" names storage-01 and
|
||||||
"Downlink to 24RJ45-POE" names 24RJ45-POE. Ports named only "Port 4" never match.
|
"Downlink to 24RJ45-POE" names 24RJ45-POE. Ports named only "Port 4" never match.
|
||||||
"""
|
"""
|
||||||
if not port_name or _is_generic_port_name(port_name):
|
if not port_name or _is_generic_port_name(port_name):
|
||||||
|
|||||||
Reference in new issue
Block a user