eping 3.60__tar.gz → 3.65__tar.gz

{eping-3.60 → eping-3.65}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eping
-Version: 3.60
+Version: 3.65
 Summary: Continuous ICMP reachability monitor built on fping, with a CSV logfile analyser (epinga)
 Author-email: Ewald Jeitler <ewald@jeitler.cc>
 License: GPL-3.0-or-later
@@ -12,12 +12,12 @@ Classifier: Operating System :: POSIX :: Linux
 Classifier: Operating System :: MacOS
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: System :: Networking :: Monitoring
-Requires-Python: >=3.8
+Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Dynamic: license-file
 
-# eping.py 3.60
+# eping.py 3.65
 
 Continuous ICMP reachability monitor built on `fping`. Scans a host list in a loop,
 reports each host UP/DOWN/NO-DNS, counts state changes. CLI (curses) or web GUI.
@@ -26,10 +26,11 @@ Written by Ewald Jeitler — <https://www.jeitler.cc>
 
 ## Requirements
 
-- Python 3.6+
+- Python 3.6+ (eping.py and epinga.py)
 - `fping` in `$PATH`
 - A terminal supporting `curs_set()` for CLI mode
 - `--check-source` used automatically if fping supports it (5.0+)
+- Non-UTF-8 terminal locale (e.g. `LANG=C`): works, but box-drawing characters are shown as ASCII/`?`; `LC_ALL=C.UTF-8` gives the full look
 
 ## Installation / Update
 
@@ -73,7 +74,7 @@ Combinable:
 
 | Source | Option |
 |---|---|
-| Host file | `-f FILE[,FILE...]`, comma/space separated, disable with `-df` |
+| Host file | `-f FILE[,FILE...]`, comma/space separated, disable with `-df`; `.txt` host list or inventory `.csv` (see *Inventory CSV import*) |
 | CIDR network | `-n` (mask /13 … /32), comma separated |
 | IP range | `-r`, `start-end`, comma separated |
 
@@ -122,6 +123,44 @@ never parse `opt:` lines, they're just text.
 The default `eping-hosts.txt`: sample hosts, this section, then every CLI option as a
 commented-out `opt:` line with its default (remove `# ` to activate).
 
+## Inventory CSV import
+
+A `.csv` inventory export (one device per row) can be used as host file: `-f FILE.csv`,
+`F`/ADD FILE (CLI), web GUI ADD FILE (FROM CLIENT, FROM SERVER, drag and drop). Files
+named `*.txt` are never treated as CSV - they keep the plain host file format above.
+
+- **Detection**: first non-empty line is a header with the columns `IP Address` and
+  `Hostname` (case-insensitive); the delimiter (`;`, `,` or tab) is detected.
+- **Columns used**: `IP Address`, `Hostname`, `Serial Number`, `Model`, `Location`,
+  `sysLocation`, `Type`, `Comment`. All other columns are ignored.
+- **Host entry**: the IP address; rows without a valid IP are ignored. With PREFER
+  HOSTNAME (`-ph`, or that address mode active when the file is added) the entry is
+  the `Hostname` instead - rows without an IP are then pinged by name too (NO-DNS if it
+  does not resolve); a name that is not a valid hostname falls back to the IP.
+  Rows without a usable entry are ignored.
+- **Duplicates**: one host per entry, the first row wins. The count of ignored and
+  duplicate rows is reported when the file is added (startup message / web footer).
+- **Log**: the six inventory values and the CSV hostname are written with every row
+  of that host, see *Logging*. A `Hostname` that is not the host entry (IP mode) is
+  only kept there as information.
+- Plain `.txt` hosts and `SAVE HOSTS FILE` carry no inventory values: a saved hosts
+  file lists only the host entries.
+
+Example (`;` delimited, extra columns are ignored):
+
+```
+Hostname;IP Address;Serial Number;Model;Location;sysLocation;Type;Comment
+sw-core-01;10.0.0.1;FOC1234A1BC;C9300-48P;Vienna DC1;Rack A3;Switch;spare PSU missing
+sw-core-02;10.0.0.2;FOC1234A1BD;C9300-48P;Vienna DC1;Rack A4;Switch;
+ap-lobby-01;;FCW2528P5PSV;C9120AXI-E;Graz HQ;Lobby;AP;
+rtr-edge-01;192.0.2.10;FTX9876B2CD;ISR4331;Linz POP;Rack B1;Router;uplink to ISP
+sw-access-01;10.0.1.1;FOC5678C3DE;C9200L-24P;Vienna DC1;Rack C1;Switch;
+fw-edge-01;192.0.2.1;JMX2345F6GH;ASA5516;Linz POP;Rack B2;Firewall;ASA 5516 - EoL 2027
+```
+
+Without `-ph` this gives 5 hosts (the IP addresses); `ap-lobby-01` has no IP and is
+ignored. With `-ph` it gives 6 hosts, named by `Hostname`.
+
 ## CLI mode
 
 Sorted table (IPv4 numerically, then hostnames), 64-column blocks. Green = UP, red =
@@ -130,7 +169,7 @@ DOWN. Columns: hostname/IP, state, RTT (ms), last-change timestamp, change count
 | Key | Action |
 |---|---|
 | `U` | view picker — all 9 views (see *Views and sort orders*) |
-| `M` | match filter — regex on hostname/IP, display only (see *Match filter*) |
+| `M` | match filter — regex on hostname/IP and inventory fields, display only (see *Match filter*) |
 | `A` | add host — IP, hostname, CIDR (/13…/32), or `ip1-ip2` (max 524288) |
 | `D` | delete host — same formats/limits as add |
 | `F` | add hosts from a file |
@@ -206,7 +245,8 @@ Single self-contained page, no external resources.
   | DELETE FILES FROM SERVER | same picker as DOWNLOAD SELECTED FILES, red DELETE button, confirms with file count; active logfile can't be deleted |
   | VIEW FILE FROM SERVER | picker: every `.csv`/`.txt` in the working dir, table (name/size/date), "select all"; opens each picked file read-only, raw content, COPY/DOWNLOAD buttons - see *VIEW FILE FROM SERVER* below |
 - **ADD FILE** dropdown: `FROM CLIENT` (local file picker) / `FROM SERVER` (picks one
-  or more `.txt` files already on the server, adds their hosts).
+  or more `.txt` files or inventory `.csv` files already on the server, adds their
+  hosts; a `.csv` without the inventory header, e.g. an eping log, is refused).
 - Keyboard shortcuts (no modifier, only while no text field has focus; own quick
   variants, not the CLI's picker keys of the same letter): `U` cycles the original 3
   views (ALL HOSTS → CURRENTLY-UP → UP+FLAPPING → ALL HOSTS), the other 6 need the
@@ -389,9 +429,13 @@ Hard-enforced at startup and live via ADV OPTIONS (`-web` only), same bounds.
 Unless `-dl`, every round appends to `eping-log_YYYY-MM-DD_HH:MM:SS.csv` (or `-o FILE`):
 
 ```
-TIMESTAMP,HOSTNAME,PREVIOUS_STATE,CURRENT_STATE,RTT,NO_OF_CHANGES,CHANGE_TIMESTAMP,TBD,IP
+TIMESTAMP,HOSTNAME,PREVIOUS_STATE,CURRENT_STATE,RTT,NO_OF_CHANGES,CHANGE_TIMESTAMP,TBD,IP,INV_HOSTNAME,SERIAL_NUMBER,MODEL,LOCATION,SYSLOCATION,TYPE,INV_COMMENT
 ```
 
+`INV_HOSTNAME` … `INV_COMMENT`: the inventory values of a host added from an inventory CSV (see
+*Inventory CSV import*), empty for all other hosts. Logs without these columns (older
+versions) stay readable by epinga.py.
+
 `TBD`: suppressed DOWN observations (`-cf`). `IP`: address actually pinged (empty for
 NO-DNS). Log rotates to a new file once it reaches `-lms` MB; a single round's data is
 always written in full to one file, rotation only starts the next round in a new file.
@@ -487,7 +531,9 @@ limit shown in the modal text.
 `PREFER HOSTNAME` (`-ph`): drops a raw-IP host from pinging when another entry resolves
 to the same address. Redundancy check cached `-dns` seconds. `PREFER IP ADDRESS`: the
 mirror - drops a hostname entry once its resolved address is already covered by a
-raw-IP entry. Both non-destructive, restored by switching to another mode.
+raw-IP entry. Both non-destructive, restored by switching to another mode. Starting
+with `-ph` resolves every hostname first (in parallel): the CLI shows a PLEASE WAIT
+box with an elapsed counter meanwhile, the web mode a line in the terminal.
 
 `SWITCH TO IP ONLY` (`-ipo`): resolves every hostname to its address (v4/v6 per
 `-4`/`-6`, A preferred by default) and renames it in place (history/uptime carry over).
@@ -513,7 +559,8 @@ message shows for 3s after. Re-triggering while running shows "already running".
 ## Match filter
 
 `M` (CLI) / match filter field (web): case-insensitive regex, display only, matched
-against shown name and resolved IP. Every host keeps being pinged regardless. Empty
+against shown name, resolved IP and the inventory fields (CSV hostname, serial
+number, model, location, sysLocation, type, comment). Every host keeps being pinged regardless. Empty
 value turns it off. CLI: replaces the version banner with `MATCH FILTER '<regex>'
 active (N of M hosts shown, all still pinged)`. Invalid regex: error shown, previous
 filter unchanged.
@@ -543,7 +590,7 @@ phases: eping's own work (~0.12s on 4109 hosts).
 - `-p` > 1 and `-i 0` reduce accuracy (false DOWN) — defaults avoid both.
 - `-dr 0` produces flapping hosts in practice — keep the default of 1.
 
-# epinga.py 2.27
+# epinga.py 2.35
 
 Analyses an eping.py CSV log: terminal summary + self-contained HTML report (no
 server, no external assets) with per-host detail, state-change timelines, and
@@ -593,13 +640,23 @@ Top bar: total/UP/flapping/DOWN/no-DNS/duplicate-host counts. Toolbar:
 
 | Control | Does |
 |---|---|
-| Filter | text or regex (case-insensitive), hostname + IP; invalid regex falls back to substring |
+| Filter | text or regex (case-insensitive), hostname + IP + inventory fields (CSV hostname, serial, model, location, sysLocation, type, comment); invalid regex falls back to substring |
 | Show | restrict to one state (flapping independent of UP/DOWN/NO-DNS) |
 | Sort | name / uptime% / avg RTT / changes; click a header, shift+click adds a tie-breaker (①②③ badge), shift+click again flips direction |
 | IP View | toggle primary label hostname↔IP (table + buckets); independent of dedup |
 | Deduplication | No dedup / Prefer IP / Prefer hostname - hides the redundant side across table, buckets, top-bar cards; DUPLICATES card is `0` once a mode is active |
+| Reset | clears Filter, Show and the inventory drop-downs (sort, IP View and deduplication stay) |
 | Download | saves the report exactly as shown (theme/dedup/sort/filter/collapsed state) as a standalone `.html`, client-side; hidden on `file://` |
 
+**Inventory filters** (logs with inventory columns, see *Inventory CSV import*): to the
+right of the top-bar counters, one drop-down each for Model, Location, sysLocation,
+Type and Comment, listing the values found in the log with their host count (`(empty)` for hosts
+without a value). They combine with each other and with Filter/Show and affect the
+Host List only. A column without any value gets no drop-down; serial number and CSV
+hostname are unique per device and searched via Filter instead. The drop-downs are
+narrow; the one in use widens while it has focus and the others move aside. A host's detail shows
+all inventory values, the Host List CSV download adds them as columns.
+
 **Comments**: section above Host List from `#COMMENT#` rows, collapsed by default,
 timestamp + text in log order. Also appear inline in a host's STATE CHANGES timeline
 (orange, 💬 marker), HTML-escaped. Same merge in text output (`PER-HOST DETAIL`,

{eping-3.60 → eping-3.65}/README.md

@@ -1,4 +1,4 @@
-# eping.py 3.60
+# eping.py 3.65
 
 Continuous ICMP reachability monitor built on `fping`. Scans a host list in a loop,
 reports each host UP/DOWN/NO-DNS, counts state changes. CLI (curses) or web GUI.
@@ -7,10 +7,11 @@ Written by Ewald Jeitler — <https://www.jeitler.cc>
 
 ## Requirements
 
-- Python 3.6+
+- Python 3.6+ (eping.py and epinga.py)
 - `fping` in `$PATH`
 - A terminal supporting `curs_set()` for CLI mode
 - `--check-source` used automatically if fping supports it (5.0+)
+- Non-UTF-8 terminal locale (e.g. `LANG=C`): works, but box-drawing characters are shown as ASCII/`?`; `LC_ALL=C.UTF-8` gives the full look
 
 ## Installation / Update
 
@@ -54,7 +55,7 @@ Combinable:
 
 | Source | Option |
 |---|---|
-| Host file | `-f FILE[,FILE...]`, comma/space separated, disable with `-df` |
+| Host file | `-f FILE[,FILE...]`, comma/space separated, disable with `-df`; `.txt` host list or inventory `.csv` (see *Inventory CSV import*) |
 | CIDR network | `-n` (mask /13 … /32), comma separated |
 | IP range | `-r`, `start-end`, comma separated |
 
@@ -103,6 +104,44 @@ never parse `opt:` lines, they're just text.
 The default `eping-hosts.txt`: sample hosts, this section, then every CLI option as a
 commented-out `opt:` line with its default (remove `# ` to activate).
 
+## Inventory CSV import
+
+A `.csv` inventory export (one device per row) can be used as host file: `-f FILE.csv`,
+`F`/ADD FILE (CLI), web GUI ADD FILE (FROM CLIENT, FROM SERVER, drag and drop). Files
+named `*.txt` are never treated as CSV - they keep the plain host file format above.
+
+- **Detection**: first non-empty line is a header with the columns `IP Address` and
+  `Hostname` (case-insensitive); the delimiter (`;`, `,` or tab) is detected.
+- **Columns used**: `IP Address`, `Hostname`, `Serial Number`, `Model`, `Location`,
+  `sysLocation`, `Type`, `Comment`. All other columns are ignored.
+- **Host entry**: the IP address; rows without a valid IP are ignored. With PREFER
+  HOSTNAME (`-ph`, or that address mode active when the file is added) the entry is
+  the `Hostname` instead - rows without an IP are then pinged by name too (NO-DNS if it
+  does not resolve); a name that is not a valid hostname falls back to the IP.
+  Rows without a usable entry are ignored.
+- **Duplicates**: one host per entry, the first row wins. The count of ignored and
+  duplicate rows is reported when the file is added (startup message / web footer).
+- **Log**: the six inventory values and the CSV hostname are written with every row
+  of that host, see *Logging*. A `Hostname` that is not the host entry (IP mode) is
+  only kept there as information.
+- Plain `.txt` hosts and `SAVE HOSTS FILE` carry no inventory values: a saved hosts
+  file lists only the host entries.
+
+Example (`;` delimited, extra columns are ignored):
+
+```
+Hostname;IP Address;Serial Number;Model;Location;sysLocation;Type;Comment
+sw-core-01;10.0.0.1;FOC1234A1BC;C9300-48P;Vienna DC1;Rack A3;Switch;spare PSU missing
+sw-core-02;10.0.0.2;FOC1234A1BD;C9300-48P;Vienna DC1;Rack A4;Switch;
+ap-lobby-01;;FCW2528P5PSV;C9120AXI-E;Graz HQ;Lobby;AP;
+rtr-edge-01;192.0.2.10;FTX9876B2CD;ISR4331;Linz POP;Rack B1;Router;uplink to ISP
+sw-access-01;10.0.1.1;FOC5678C3DE;C9200L-24P;Vienna DC1;Rack C1;Switch;
+fw-edge-01;192.0.2.1;JMX2345F6GH;ASA5516;Linz POP;Rack B2;Firewall;ASA 5516 - EoL 2027
+```
+
+Without `-ph` this gives 5 hosts (the IP addresses); `ap-lobby-01` has no IP and is
+ignored. With `-ph` it gives 6 hosts, named by `Hostname`.
+
 ## CLI mode
 
 Sorted table (IPv4 numerically, then hostnames), 64-column blocks. Green = UP, red =
@@ -111,7 +150,7 @@ DOWN. Columns: hostname/IP, state, RTT (ms), last-change timestamp, change count
 | Key | Action |
 |---|---|
 | `U` | view picker — all 9 views (see *Views and sort orders*) |
-| `M` | match filter — regex on hostname/IP, display only (see *Match filter*) |
+| `M` | match filter — regex on hostname/IP and inventory fields, display only (see *Match filter*) |
 | `A` | add host — IP, hostname, CIDR (/13…/32), or `ip1-ip2` (max 524288) |
 | `D` | delete host — same formats/limits as add |
 | `F` | add hosts from a file |
@@ -187,7 +226,8 @@ Single self-contained page, no external resources.
   | DELETE FILES FROM SERVER | same picker as DOWNLOAD SELECTED FILES, red DELETE button, confirms with file count; active logfile can't be deleted |
   | VIEW FILE FROM SERVER | picker: every `.csv`/`.txt` in the working dir, table (name/size/date), "select all"; opens each picked file read-only, raw content, COPY/DOWNLOAD buttons - see *VIEW FILE FROM SERVER* below |
 - **ADD FILE** dropdown: `FROM CLIENT` (local file picker) / `FROM SERVER` (picks one
-  or more `.txt` files already on the server, adds their hosts).
+  or more `.txt` files or inventory `.csv` files already on the server, adds their
+  hosts; a `.csv` without the inventory header, e.g. an eping log, is refused).
 - Keyboard shortcuts (no modifier, only while no text field has focus; own quick
   variants, not the CLI's picker keys of the same letter): `U` cycles the original 3
   views (ALL HOSTS → CURRENTLY-UP → UP+FLAPPING → ALL HOSTS), the other 6 need the
@@ -370,9 +410,13 @@ Hard-enforced at startup and live via ADV OPTIONS (`-web` only), same bounds.
 Unless `-dl`, every round appends to `eping-log_YYYY-MM-DD_HH:MM:SS.csv` (or `-o FILE`):
 
 ```
-TIMESTAMP,HOSTNAME,PREVIOUS_STATE,CURRENT_STATE,RTT,NO_OF_CHANGES,CHANGE_TIMESTAMP,TBD,IP
+TIMESTAMP,HOSTNAME,PREVIOUS_STATE,CURRENT_STATE,RTT,NO_OF_CHANGES,CHANGE_TIMESTAMP,TBD,IP,INV_HOSTNAME,SERIAL_NUMBER,MODEL,LOCATION,SYSLOCATION,TYPE,INV_COMMENT
 ```
 
+`INV_HOSTNAME` … `INV_COMMENT`: the inventory values of a host added from an inventory CSV (see
+*Inventory CSV import*), empty for all other hosts. Logs without these columns (older
+versions) stay readable by epinga.py.
+
 `TBD`: suppressed DOWN observations (`-cf`). `IP`: address actually pinged (empty for
 NO-DNS). Log rotates to a new file once it reaches `-lms` MB; a single round's data is
 always written in full to one file, rotation only starts the next round in a new file.
@@ -468,7 +512,9 @@ limit shown in the modal text.
 `PREFER HOSTNAME` (`-ph`): drops a raw-IP host from pinging when another entry resolves
 to the same address. Redundancy check cached `-dns` seconds. `PREFER IP ADDRESS`: the
 mirror - drops a hostname entry once its resolved address is already covered by a
-raw-IP entry. Both non-destructive, restored by switching to another mode.
+raw-IP entry. Both non-destructive, restored by switching to another mode. Starting
+with `-ph` resolves every hostname first (in parallel): the CLI shows a PLEASE WAIT
+box with an elapsed counter meanwhile, the web mode a line in the terminal.
 
 `SWITCH TO IP ONLY` (`-ipo`): resolves every hostname to its address (v4/v6 per
 `-4`/`-6`, A preferred by default) and renames it in place (history/uptime carry over).
@@ -494,7 +540,8 @@ message shows for 3s after. Re-triggering while running shows "already running".
 ## Match filter
 
 `M` (CLI) / match filter field (web): case-insensitive regex, display only, matched
-against shown name and resolved IP. Every host keeps being pinged regardless. Empty
+against shown name, resolved IP and the inventory fields (CSV hostname, serial
+number, model, location, sysLocation, type, comment). Every host keeps being pinged regardless. Empty
 value turns it off. CLI: replaces the version banner with `MATCH FILTER '<regex>'
 active (N of M hosts shown, all still pinged)`. Invalid regex: error shown, previous
 filter unchanged.
@@ -524,7 +571,7 @@ phases: eping's own work (~0.12s on 4109 hosts).
 - `-p` > 1 and `-i 0` reduce accuracy (false DOWN) — defaults avoid both.
 - `-dr 0` produces flapping hosts in practice — keep the default of 1.
 
-# epinga.py 2.27
+# epinga.py 2.35
 
 Analyses an eping.py CSV log: terminal summary + self-contained HTML report (no
 server, no external assets) with per-host detail, state-change timelines, and
@@ -574,13 +621,23 @@ Top bar: total/UP/flapping/DOWN/no-DNS/duplicate-host counts. Toolbar:
 
 | Control | Does |
 |---|---|
-| Filter | text or regex (case-insensitive), hostname + IP; invalid regex falls back to substring |
+| Filter | text or regex (case-insensitive), hostname + IP + inventory fields (CSV hostname, serial, model, location, sysLocation, type, comment); invalid regex falls back to substring |
 | Show | restrict to one state (flapping independent of UP/DOWN/NO-DNS) |
 | Sort | name / uptime% / avg RTT / changes; click a header, shift+click adds a tie-breaker (①②③ badge), shift+click again flips direction |
 | IP View | toggle primary label hostname↔IP (table + buckets); independent of dedup |
 | Deduplication | No dedup / Prefer IP / Prefer hostname - hides the redundant side across table, buckets, top-bar cards; DUPLICATES card is `0` once a mode is active |
+| Reset | clears Filter, Show and the inventory drop-downs (sort, IP View and deduplication stay) |
 | Download | saves the report exactly as shown (theme/dedup/sort/filter/collapsed state) as a standalone `.html`, client-side; hidden on `file://` |
 
+**Inventory filters** (logs with inventory columns, see *Inventory CSV import*): to the
+right of the top-bar counters, one drop-down each for Model, Location, sysLocation,
+Type and Comment, listing the values found in the log with their host count (`(empty)` for hosts
+without a value). They combine with each other and with Filter/Show and affect the
+Host List only. A column without any value gets no drop-down; serial number and CSV
+hostname are unique per device and searched via Filter instead. The drop-downs are
+narrow; the one in use widens while it has focus and the others move aside. A host's detail shows
+all inventory values, the Host List CSV download adds them as columns.
+
 **Comments**: section above Host List from `#COMMENT#` rows, collapsed by default,
 timestamp + text in log order. Also appear inline in a host's STATE CHANGES timeline
 (orange, 💬 marker), HTML-escaped. Same merge in text output (`PER-HOST DETAIL`,

{eping-3.60 → eping-3.65}/pyproject.toml

@@ -4,12 +4,12 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "eping"
-version = "3.60"
+version = "3.65"
 description = "Continuous ICMP reachability monitor built on fping, with a CSV logfile analyser (epinga)"
 readme = "README.md"
 license = { text = "GPL-3.0-or-later" }
 authors = [{ name = "Ewald Jeitler", email = "ewald@jeitler.cc" }]
-requires-python = ">=3.8"
+requires-python = ">=3.6"
 classifiers = [
     "Environment :: Console :: Curses",
     "Intended Audience :: System Administrators",