eping 4.12__tar.gz → 4.76__tar.gz

{eping-4.12 → eping-4.76}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eping
-Version: 4.12
+Version: 4.76
 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
@@ -17,13 +17,25 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Dynamic: license-file
 
-# eping.py 4.12
+# eping.py 4.76
 
 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.
 
 Written by Ewald Jeitler — <https://www.jeitler.cc>
 
+## Screenshots
+
+Web GUI (`-web`) - 61 demo hosts, mouse-over shows the host details and its state history:
+
+![eping web GUI](https://raw.githubusercontent.com/ewaldj/eping/main/docs/img/web-gui.png)
+
+![eping web GUI, host details](https://raw.githubusercontent.com/ewaldj/eping/main/docs/img/web-gui-host-details.png)
+
+Terminal (curses) mode:
+
+![eping CLI](https://raw.githubusercontent.com/ewaldj/eping/main/docs/img/cli.png)
+
 ## Requirements
 
 - Python 3.6+ (eping.py and epinga.py)
@@ -57,7 +69,7 @@ Portable Windows version (web GUI only, no installation): download and unpack
 - The web GUI opens in the browser (default `http://127.0.0.1:8080`). The port is read from the hosts file
   (`opt: -port 9000`); a port already in use is reported and can be changed in the launcher window.
 - No terminal (curses) mode and no `-wv`/`-wvc` on Windows; log file names use `-` instead of `:`.
-- Extra options: put them in `eping-args.txt` next to `eping.exe`. Details: `README-WINDOWS.txt` in the zip.
+- Extra options: CLI options field or `eping-args.txt` in the working folder. Working folder: `<home>/eping` (`%USERPROFILE%\eping` on Windows) - hosts file, logs, reports, `eping-console.log`, `eping-args.txt` and `eping-launcher.cfg` live there, so the program folder needs no write access. Change it with the *Working dir* field (paste a path, Enter confirms) or the *Change...* button (folder dialog); applied with Start / Restart, or with `-wd DIR` in the CLI options field (wins over the button) (hosts file, logs, reports and console log then use DIR). An `eping-args.txt` / `eping-launcher.cfg` found next to the program (older versions) is read until the first save; copy an existing `eping-hosts.txt` to the working folder once. Details: `README-WINDOWS.txt` in the zip.
 
 ## Quick start
 
@@ -131,7 +143,7 @@ flag typed on the command line wins over the same flag from a file. Only applies
 the initial `-f` read at startup — `F`/ADD FILE (CLI) and ADD HOSTS FILE (web)
 never parse `opt:` lines, they're just text.
 
-`opt:` lines also work at the top of an inventory `.csv`. SAVE HOSTS FILE and DOWNLOAD ALL/ACTIVE HOSTS write every option that differs from the default there (start-up flags and live ADV OPTIONS changes; not `-f -df -n -r -o -up -setref -gn -cl`).
+`opt:` lines also work at the top of an inventory `.csv`. SAVE HOSTS writes every option that differs from the default there (start-up flags and live ADV OPTIONS changes; not `-f -df -n -r -o -up -setref -gn -cl`).
 
 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).
@@ -159,8 +171,8 @@ named `*.txt` are never treated as CSV - they keep the plain host file format ab
   only kept there as information.
 - **Filters**: `M` matches the inventory values as text, `V` / ADV FILTER selects them
   (see *ADV FILTER*).
-- **Save**: if the displayed hosts carry inventory values, `SAVE HOSTS FILE` writes an
-  inventory `.csv` (see *Web GUI*); plain `.txt` hosts are saved as `.txt`.
+- **Save**: if the displayed hosts carry inventory values, `SAVE HOSTS` offers an
+  inventory `.csv` (default for such hosts, see *Web GUI*) or a plain `.txt`.
 
 Example (`;` delimited, extra columns are ignored):
 
@@ -237,16 +249,24 @@ Single self-contained page, no external resources.
   if needed ("SCROLL RIGHT FOR MORE" hint in the stats bar).
 - Footer stats: HOSTS, RUNTIME, HOST UP/DOWN/FLAPPING always count all hosts; SHOWN is the
   number of rows displayed after the view, the match filter and the ADV FILTER. The CLI footer counts the same way. RUNTIME shows `n/a` briefly during a background round.
+- While a source switch (local / jump host) is under way the message line shows `switching to ... - please wait ...`,
+  then `switched to ... - done`. The JUMPHOST button is green while a jump host is active.
 - Adding many hosts (`ADD`, ADD HOSTS FILE, upload) shows "added N host(s) - please wait,
   pinging ..." until they appear with a state, then `done`.
 - Font size 6–28px (slider, `A−`/`A+`, `+`/`−` keys), stored in `localStorage`.
 - Column headers sort the list (IPv4-aware).
 - Toolbar, two rows (wraps if narrow):
   - Row 1: view select (9 views), sort order select, SET REFERENCE, ZERO CHANGES,
-    CLEAR ALL, address mode select, GET NAMES, ADV OPTIONS, RESET LOG, FILE OPERATIONS
-    select, EXIT, font size.
+    CLEAR ALL, address mode select, GET NAMES, ADV OPTIONS, LOGGING, FILE OPERATIONS
+    select, STOP, font size.
   - Row 2: match filter (SET/CLEAR), ADV FILTER, host field (ADD/DELETE), ADD/DEL LIST, comment
-    field (COMMENT), GENERATE REPORT select.
+    field (COMMENT), GENERATE REPORT select, PAUSE/RESUME button.
+  - **PAUSE / RESUME** (last button of row 2): `PAUSE` pauses the check - no pings are sent, the table, the
+    counters and the log stay as they are (header shows `PAUSED`, the button turns red and reads `RESUME`).
+    Commands (view, sort, filter, ADD/DELETE ...) keep working while paused; added hosts are pinged after
+    `RESUME`. A round that is running when `PAUSE` is pressed is cut short. The log gets the comment rows
+    `CHECK PAUSED` / `CHECK RESUMED`; epinga.py shows the pause as a gap in the timeline
+    (grey, like missing data) and does not count it as time in any state. Works in `-web` and `-wvc` (no CLI key); not in the read-only view (`-wv`).
   - View select, sort order select, address mode select and ADV OPTIONS all match the
     CLI's `U`/`O`/`P`/`X` pickers exactly. FILE OPERATIONS (incl. ADD HOSTS FILE FROM CLIENT/
     FROM SERVER) is web-gui-only (no CLI key - CLI already runs on the server's own
@@ -256,19 +276,13 @@ Single self-contained page, no external resources.
   |---|---|
   | ADD HOSTS FILE FROM SERVER | picks one 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 |
   | ADD HOSTS FILE FROM CLIENT | dialog with a file picker (`.txt`/`.csv`; works in Safari), adds the hosts; a file can also be dropped anywhere on the page |
-  | SAVE HOSTS FILE ON SERVER | confirmation, then saves the currently displayed hosts; blank name overwrites the active `-f` hostfile (first one, if eping.py was started with one) or, with none active, the default `eping-hosts.txt`; a typed name always saves as that new file instead, `.txt` appended once, active hostfile left untouched. If the displayed hosts carry inventory values (CSV import) an inventory `.csv` is written instead (`;` delimited, columns as in *Inventory CSV import*); a `.txt` name or hostfile then becomes `.csv`, the default is `eping-hosts.csv`. The options that differ from the default are written first as `opt:` lines (see *Host file format*); for a `.csv` the checkboxes `include options (opt: lines)` (default on) and `save as .txt (hosts only, no inventory)` (default off) are offered |
-  | UPLOAD FILE TO SERVER | picks a local `.txt`/`.csv`, saves as-is server-side, no host parsing; never overwrites, appends `-1`/`-2`/... |
-  | DOWNLOAD ALL HOSTS | full reference list: inventory `.csv` if the hosts carry inventory values, else `.txt`; non-default options first as `opt:` lines (`.csv`: checkboxes `include options`, default on, and `save as .txt`, default off) |
-  | DOWNLOAD ACTIVE HOSTS | currently displayed hosts (view/address mode/filter applied), same format and options as DOWNLOAD ALL HOSTS |
-  | DOWNLOAD ACTIVE LOGFILE | active CSV log, zipped; disabled while logging off |
-  | DOWNLOAD SELECTED FILES | picker: every `.csv`/`.txt`/`.html` in the working dir, table (name/size/date), extension filter, "select all", "no compression" checkbox (single-file selection only); multi-select bundles into one ZIP |
-  | 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 |
+  | SAVE HOSTS | one dialog: `ALL HOSTS` (default, full reference list) or `SHOWN HOSTS` (current view/address mode/filter); `ON SERVER` or `DOWNLOAD TO THIS COMPUTER`; format `CSV` (inventory `;` columns, preselected) or `TXT` (one host per line) is offered only if the list carries inventory values, otherwise `TXT` is used without asking; checkbox `include options (opt: lines)` (default on). On the server a blank name overwrites the active `-f` hostfile (first one; extension follows the format) or, with none active, writes `eping-hosts.csv`/`.txt`; a typed name saves as that new file, active hostfile untouched |
+  | SERVER OPERATIONS | one dialog with a file table (every `.csv`/`.txt`/`.html`/`.zip` in the working dir; name/size/date, sortable, extension filter, "select all") and the buttons `DOWNLOAD` (more than one file = one ZIP; "no compression" checkbox for a single file), `VIEW` (only `.txt`/`.csv`, read-only, raw content, COPY/DOWNLOAD buttons - see *VIEW (SERVER OPERATIONS)* below), `DELETE` (red, confirms with file count, never the active logfile) and `UPLOAD` (picks a local `.txt`/`.csv`/`.zip`, saves as-is server-side, no host parsing; never overwrites, appends `-1`/`-2`/...) |
 - 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
-  dropdown; `O` cycles all 5 sort orders one at a time; `P`/`I` toggle PREFER HOSTNAME /
-  SWITCH TO IP ONLY directly, the address mode select reaches all 4 modes; `G`/`S`/`Z`/
+  dropdown; `O` cycles all 5 sort orders one at a time; `P`/`I` toggle DEDUP: KEEP HOSTNAME /
+  RESOLVE ALL TO IP directly, the address mode select reaches all 4 modes; `G`/`S`/`Z`/
   `C`/`L`/`E` click the matching button (`E`/`C`/`L` confirm); `A`/`D` focus host field;
   `M`/`T` focus their field; `V` opens ADV FILTER; `F` opens the ADD HOSTS FILE FROM CLIENT picker; `R` forces a status refresh;
   `+`/`−` font size (works while typing). No keyboard shortcut for `X`/ADV OPTIONS or
@@ -340,21 +354,19 @@ directly, `D` resets the selected option to its default, `R` resets all, ESC/`X`
 
 | Option | Range | 0/-1 means |
 |---|---|---|
-| BACKOFF | 1 – 2 | — |
 | TIMEOUT | 10 – 5000 ms | — |
 | RETRIES | 0 – 5 | — |
-| DOWN RETRIES | 0 – 5 | `0` = disabled, full RETRIES |
 | INTERVAL | -1 – 250 ms | `-1` = auto (use RATE), `0` = no pacing |
 | THREADS | 0 – 32 | `0` = auto |
 | WAIT TIME | 0 – 600 s | — |
 | CONFIRM | 1 – 10 | — |
+| NEW HOST GRACE | 0 – 60 s | — |
+| SILENT LIMIT | 2 – 10 periods | — |
 | RATE | 10 – 25000 pps | — |
 | FLAP WINDOW | 1 – 72000 min | — |
-| DOWN SLICES | 1 – 20 | — |
-| FULL SWEEP | 0 – 50 | `0` = disabled |
 | DNS TTL | 0 – 3600 s | — |
 | TIMEZONE | -24 – +24 h | — |
-| MAX LOG SIZE | 0, 10 – 2500 MB | `0` = no rotation |
+| MAX LOG SIZE | 0, 10 – 2500 MB | default `500`; `0` = no rotation |
 | MAX LOG FILES | 0 – 500 | `0` = unlimited |
 
 Same bounds as the matching CLI flags (`-lms`/`-lmf` for the last two - see *Output*).
@@ -380,48 +392,60 @@ Same bounds as the matching CLI flags (`-lms`/`-lmf` for the last two - see *Out
 | POST | `/api/command` | `{"cmd":"...","value":"..."}` | control (see cmd list below) |
 | POST | `/api/advvalues` | `{"filter":{...}}` | ADV FILTER: values still selectable for a draft selection (same format as `adv_filter`) |
 | POST | `/api/upload` | host list, text | add hosts |
-| POST | `/api/log_sources` | `{"names":[...]}` | SOURCE values of the named logfiles (empty = active logfile), for SELECT JUMPHOST |
 | POST | `/api/jumphost` | `{"action":"info|test|trust|connect|local","host":...,"port":...,"user":...,"secret":...,"hostkey":"ask|accept-new|off","key":...}` | JUMPHOST window (see *SSH source (JUMPHOST)*) |
 
 `cmd` values: `up_only`, `set_filter`, `addr_mode`, `get_names`, `match_filter`,
 `adv_filter`, `sort`, `add`, `del`, `set_ref`, `zero`, `add_comment`, `reset_log`, `clear`,
-`set_option`, `reset_options`, `run_report`, `save_hosts_file`, `exit`. `adv_filter` value: JSON object `{"<field>":{"mode":"in|out","values":[...]}}` with the fields `model`,
+`set_option`, `reset_options`, `run_report`, `pause` (value `1` = PAUSE, `0` = RESUME), `save_hosts_file`, `exit`. `adv_filter` value: JSON object `{"<field>":{"mode":"in|out","values":[...]}}` with the fields `model`,
 `location`, `sysloc`, `type`, `comment`; `\u0001none` as value = hosts without a value; `{}` = off
-(the old `{"<field>":"<value>"}` form is still accepted as `in` with one value). `set_option`
+`set_option`
 value: `key=value`. `reset_log` value: logging off - optional custom file name (blank =
 auto-generated); logging on - `y` (clear) or `new`/`new=<name>` (new file, optional
 custom name). `run_report`: `value` = empty (active logfile) or one `.csv` filename; or
 JSON body field `values`: `[...]` to merge and analyse multiple `.csv` files as one
-(max 25); optional body field `sources`: `[...]` restricts the analysis to these SOURCE values. `save_hosts_file` value: optional target file name (blank
-= active `-f` hostfile, or `eping-hosts.txt` if none).
+(max 25); optional body field `sources`: `[...]` restricts the analysis to these SOURCE values. `save_hosts_csv`/`save_hosts_txt` (+ `_noopt`, + `_all` for all hosts) value: optional target file name (blank
+= active `-f` hostfile, or `eping-hosts.csv`/`.txt` if none); `save_hosts_file` = auto format.
 
 `-wv` answers `403` to `POST /api/command`/`/api/upload`; `-wvc`/`-web` allow both. No
 authentication. Default bind `0.0.0.0` — use `-bind 127.0.0.1` outside trusted networks.
 
-## How a scan round works
-
-1. Hostnames resolved once (32 parallel), cached around `-dns` seconds (randomized a
-   bit so a large batch resolved together doesn't all expire - and need re-resolving -
-   in the same round later). Same-address names share one probe. Unresolvable → NO-DNS,
-   no fping call. `-dns 0` = fping-side resolve. A command (filter, add, ...) cuts
-   the name resolution short as well, so it applies at once even with thousands of
-   hostnames.
-2. UP/new hosts get full `-re` retries; confirmed-DOWN hosts get `-dr` retries. Every
-   `-fs`-th round probes everything with full retries.
-3. Only 1/`-ds` of DOWN hosts probed per round, strided.
-4. Both classes run concurrently, one fping process each, sharing `--rate`; `-i`
-   derived from that share.
-5. With `-cf` > 1, a host leaves UP only after that many consecutive non-UP results;
-   suppressed count written to the log's TBD column.
-
-One fping process per group (`-p` still accepts up to 32 for diagnostics): measured on
-a /20 with 4109 hosts, 9 processes reported 244 UP, one process reported 866.
-
-`-i` floor is 1ms (~1000 pps nominal); measured ~1.8ms (~550 pps) on a real /20. `-i 0`
-removes pacing (needs fping's install privileges), one hard burst.
+## How checking works (loop mode)
+
+eping starts long-running `fping -l` processes and takes one snapshot of their latest results
+per round. A process keeps one ICMP identifier for its whole life (few NAT / conntrack entries
+on a router) and a jump host sees one command instead of one per round.
+
+- **Period:** fping pings every host once per period = `-w` (at least 200 ms), raised to
+  `hosts x interval + timeout` so one pass fits. A round ends when every host delivered a new
+  result (at most one period + timeout). RUNS counts only rounds in which hosts were checked.
+- **UP / DOWN:** a reply = UP at once. DOWN after `-re` + 1 timeouts in a row (fewer when the ping period is
+  long: the number is cut to what fits in 2 x `-t`, at least 2), or when fping delivered nothing for a host for
+  `-sp` periods. fping drops replies later than `-t`, so `-t` is the longest a reply may take. With `-cf` > 1 a
+  host leaves UP only after that many consecutive non-UP results (suppressed count in the log's TBD column).
+- **New hosts:** only an answer is reported during a grace period of (miss limit + 1) periods + `-ng` s (1 s) - a slow first
+  contact (new NAT / firewall state) must not show up as DOWN.
+- **Names:** resolved by background threads (32 parallel, cached `-dns` seconds, randomized; an expired
+  entry stays in use until its refresh is done). A name without an address yet joins as soon as it
+  resolves, a round waits at most 2 s for names never resolved before; unresolvable = NO-DNS.
+  `-dns 0` = fping resolves. With a jump host the jump host resolves.
+- **Add / delete:** ADD starts one extra fping for the new hosts, running processes are not touched.
+  DELETE only stops judging the hosts. Everything is restarted (results kept) when the source or a
+  timing option changes, a process died, there are more than 16 processes or many hosts were removed.
+- **Stall guard:** if at least 30 % (and 20) of the hosts of one fping process go silent at once, that is
+  taken as a stall of fping or of this computer's network, not as hosts being down: their state is kept for
+  up to 5 silent periods.
+- **Rate:** one process sends one packet per `-i` ms, `-ra` sets the packets/s. A pass over N hosts takes at
+  least N / `-ra` s: 32 000 hosts at `-ra 1000` = about 34 s per round. Raise `-ra` for big lists (mind the
+  router / NAT / jump host). `-i` floor is 1 ms; `-i 0` removes pacing.
+- PAUSE stops the processes, RESUME starts them again.
 
 ## Options
 
+### Working directory
+`-wd DIR` · hosts file, logs and reports live in DIR (created if missing, `~` expanded; default: current directory).
+Relative `-f` / `-sshkey` paths stay relative to the invocation directory. Not read from `opt:` lines. The macOS / Windows
+launchers pass `-wd <home>/eping` by default; change it with `-wd DIR` in the launcher's CLI options field.
+
 ### Host selection
 `-f` hostfile(s) (comma/space separated) · `-df` disable hostfile · `-n` CIDR (comma
 separated) · `-r` IP range (comma separated, shortened end)
@@ -429,21 +453,19 @@ separated) · `-r` IP range (comma separated, shortened end)
 ### Probing
 | Option | Range | Default | Meaning |
 |---|---|---|---|
-| `-B` | 1 – 2 | 1.5 | backoff factor per retry |
-| `-t` | 10 – 5000 | 250 | initial timeout (ms) |
-| `-re` | 0 – 5 | 3 | retries, UP/unknown hosts |
-| `-dr` | 0 – 5 | 1 | retries, confirmed DOWN (`0` = same as others) |
+| `-t` | 10 – 5000 | 1000 | ping timeout (ms): a reply later than this is lost |
+| `-re` | 0 – 5 | 3 | DOWN after up to `-re` + 1 timeouts in a row (see *How checking works*) |
 | `-i` | -1 – 250 | auto | send interval (ms), overrides `-ra`; `-1` auto, `0` unpaced |
-| `-p` | 0 – 32 | auto | fping processes per group |
-| `-w` | 0 – 600 | 0.5 | pause between rounds (s) |
+| `-p` | 0 – 32 | auto | fping processes per address family |
+| `-w` | 0 – 600 | 0.5 | ping period per host (s, at least 0.2) |
 | `-cf` | 1 – 10 | 2 | consecutive DOWN before leaving UP (`1` = off) |
+| `-ng` | 0 – 60 | 1 | seconds added to the grace period of new hosts |
+| `-sp` | 2 – 10 | 3 | silent ping periods (no fping output) until DOWN |
 | `-ra` | 10 – 25000 | 1000 | ICMP packets/s |
 | `-fw` | 1 – 72000 | 72000 | minutes to count as flapping |
-| `-ds` | 1 – 20 | 4 | spread DOWN hosts over N rounds |
-| `-fs` | 0 – 50 | 10 | every Nth round: full sweep (`0` = never) |
 | `-dns` | 0 – 3600 | 300 | hostname cache TTL (s, `0` off) |
 | `-4` / `-6` | — | auto | prefer IPv4/IPv6, mutually exclusive |
-| `-ph` | — | off | start with PREFER HOSTNAMES |
+| `-ph` | — | off | start with DEDUP: KEEP HOSTNAME |
 | `-ipo` | — | off | start with IP ONLY |
 | `-gn` | — | off | GET NAMES once at startup |
 | `-ncs` | — | off | skip `--check-source` |
@@ -465,9 +487,11 @@ Hard-enforced at startup and live via ADV OPTIONS (`-web` only), same bounds.
 | `-cl` | — | — | delete all `eping-*` files and exit |
 | `-tz` | -24 – +24 | 0 | timezone offset (h) |
 | `-dg` | — | off | cycle time breakdown |
+| `-debug` | — | off | write engine events (LOOP START / ADD / DOWN burst / STALL, SLOW ROUND) as `#COMMENT#` rows to the log |
 | `-du` | — | — | disable online version check |
-| `-lms` | 0, 10 – 2500 | 0 | max CSV log size (MB) before rotating; `0` = no rotation |
+| `-lms` | 0, 10 – 2500 | 500 | max CSV log size (MB) before rotating; `0` = no rotation |
 | `-lmf` | 0 – 500 | 0 | max `eping-log_*.csv` files kept, oldest deleted first; `0` = unlimited |
+| `-lnz` | — | off | do not zip logfiles finished by size rotation (default: zipped in the background) |
 | `-web` | — | off | web GUI instead of CLI |
 | `-wv` | — | off | CLI + read-only web view |
 | `-port` | — | 8080 | http port |
@@ -493,6 +517,12 @@ original timestamp with an incrementing `-1`/`-2`/... suffix
 (`eping-log_<original-timestamp>-N.csv`); starting a new file manually (`RESET
 LOGGING`/`L`) always gets the current time instead and begins a fresh chain.
 
+By default a finished (rotated) file is zipped in the background to `eping-log_<ts>-N.csv.zip` (one csv inside, original
+timestamp kept; the csv is removed only after the zip is complete); `-lnz` keeps plain csv. A `*.zip` (rotated file, or a
+download - also `name(1).zip`) is handled like a `*.csv` everywhere: CHOOSE FILE / VIEW FILE / DELETE lists, UPLOAD FILE TO
+SERVER / UPLOAD FROM CLIENT, GENERATE REPORT (a zip with several csv, e.g. a multi-file download, is read completely and
+merged), `-lmf` pruning and `epinga.py -f` (one csv per zip). Downloading a zip sends it as is.
+
 `ZERO CHANGES`/`Z`: resets `NO_OF_CHANGES`/`CHANGE_TIMESTAMP` for the running instance;
 log file keeps everything already written.
 
@@ -500,11 +530,12 @@ log file keeps everything already written.
 in `HOSTNAME`, text in `IP`. No-op with a notice if logging is off. epinga.py detects
 these rows automatically.
 
-`RESET LOGGING`/`L`:
+`LOGGING`/`L`:
 - Logging on: confirmation first (CLI keypress / web modal). `Y` clears all entries,
   restarts logging into the same file. `N` starts a fresh file, old file untouched -
   optional custom name (blank = auto-generated `eping-log_<timestamp>.csv`); a name
-  that already exists is rejected, nothing is created. `ESC`/`ENTER` cancels.
+  that already exists is rejected, nothing is created. `S` (STOP LOGGING) stops logging,
+  file kept; `L` then offers START LOGGING again. `ESC`/`ENTER` cancels.
 - Logging off: same dialog, no clear option - `START LOGGING` starts a fresh file
   right away, same optional custom name.
 
@@ -515,6 +546,9 @@ Run fping on a jump host instead of locally (system `ssh` only). Any Linux host
 the password or key passphrase is asked on the terminal at startup. At runtime: `J` in the CLI,
 JUMPHOST button in the web GUI (after ADV OPTIONS).
 
+With a working resolver on the jump host (default, see `-sshnr`) the `IP` column of the log holds the address the jump host
+resolved a hostname to - like a local run - so epinga shows `host | IP` for jump host rows as well. Without one it stays the hostname.
+
 ![JUMPHOST window](https://raw.githubusercontent.com/ewaldj/eping/main/docs/img/jumphost.png)
 
 - Window: HOST, PORT, USER, PASSWORD (key passphrase), HOST KEY, NAMES, KEY FILE. TEST checks ssh, login and
@@ -560,7 +594,7 @@ exit, a full notice prints once:
     https://github.com/ewaldj/eping
 ```
 
-Shown on any terminal-driven exit (CLI `[E]`/Ctrl-C, `-web`'s EXIT/Ctrl-C in its
+Shown on any terminal-driven exit (CLI `[E]`/Ctrl-C, `-web`'s STOP/Ctrl-C in its
 terminal). The web GUI's in-browser banner is separate and shorter.
 
 ## Run analysis on exit
@@ -573,7 +607,7 @@ Run an analysis of this logfile with epinga.py now? [y/N]:
 
 `y` (case-insensitive) runs `epinga.py -f <logfile>` before exit; anything else skips
 it. Only asked on a terminal-driven exit (CLI `[E]`/Ctrl-C, or `-wv`/`-wvc`'s own
-keyboard `[E]`/Ctrl-C); exiting via a browser's EXIT button never asks. No prompt if
+keyboard `[E]`/Ctrl-C); exiting via a browser's STOP button never asks. No prompt if
 logging is off or the logfile is empty/missing.
 
 ## GENERATE REPORT (web gui) / ANALYSE NOW (CLI `N`)
@@ -583,17 +617,16 @@ running - not just at exit. Web: GENERATE REPORT dropdown, four entries - `ACTIV
 LOGFILE` analyses the active CSV log (needs logging on, non-empty logfile, else the tab
 closes and a footer error is shown), `CHOOSE LOGFILE` picks one or more `.csv` files in
 the working dir - table (name/size/date), "select all" checkbox, nothing preselected;
-up to 25 files per report, checking a 26th is refused. `SELECT JUMPHOST` lists the
-sources (`local` and jump hosts, log column `SOURCE`) found in the active logfile - all checked,
-ENTER = GENERATE; only the periods of the checked sources are calculated (see *Source filter* in the
-epinga.py section). Shown only if the log holds more than one source.
+up to 25 files per report, checking a 26th is refused. If a log holds more than one source (`local` and jump hosts, log column `SOURCE`), the report contains all of them and a
+source switch (see *Source switch in the HTML report*); no dialog.
+
+The report tab opens right away; if the browser blocks it (e.g. after a long upload), a REPORT READY dialog with an OPEN REPORT button appears.
+While the report is generated the waiting tab shows a progress bar with the step (merging files / analysing / analysing source N of M / writing report), the percentage and an estimated remaining time (extrapolated from the elapsed time, shown after a few seconds); without a tab the same text is shown in the footer. The percentage covers all passes (the main analysis plus one per source, see *Source switch*).
 
 `UPLOAD FROM CLIENT` picks one or more `.csv` logfiles on the computer running the browser (max 25, 1 GB each);
 they are uploaded to a server temp dir, merged like `CHOOSE LOGFILE` and analysed as one report. Temp files and
 report are removed when eping.py exits or on the next upload.
 
-![SELECT JUMPHOST](https://raw.githubusercontent.com/ewaldj/eping/main/docs/img/select-jumphost.png)
-
 More than one selected file is merged chronologically (by the row timestamps, streamed) into one temporary
 CSV, analysed as a single logfile, then the temp file is removed. Result opens in a new
 tab; if a selected file was invalid or has meanwhile been removed (e.g. by log rotation
@@ -603,10 +636,10 @@ logfile only (needs logging on, non-empty logfile, else a notice is shown); resu
 path/error shown once done. Only one run at a time either way. See *epinga.py* below for
 the report, and *Called from eping.py* under epinga.py for the invocation.
 
-## VIEW FILE FROM SERVER (web gui only)
+## VIEW (SERVER OPERATIONS, web gui only)
 
 Read-only viewer for one or more `.csv`/`.txt` files in the working dir - FILE
-OPERATIONS > VIEW FILE FROM SERVER, table picker (name/size/date), "select all". Each
+OPERATIONS > SERVER OPERATIONS > VIEW, table picker (name/size/date), "select all". Each
 selected file opens in its own tab: raw content, COPY (clipboard) and DOWNLOAD buttons,
 no editing. Selecting more than one file opens the first tab right away; that tab shows
 a centered "N more file(s) selected / OPEN NEXT FILE" box to open the next one, and so
@@ -615,26 +648,27 @@ Max 200MB per file - larger files are refused with a message pointing at DOWNLOA
 instead, and the picker greys those files out, labeled "TOO LARGE", with the current
 limit shown in the modal text.
 
-## Address modes (PREFER HOSTNAME / SWITCH TO IP ONLY / GET NAMES)
+## Address modes (DEDUP: KEEP HOSTNAME / RESOLVE ALL TO IP / GET NAMES)
 
-`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
+`DEDUP: KEEP HOSTNAME` (`-ph`): drops a raw-IP host from pinging when another entry resolves
+to the same address. Redundancy check cached `-dns` seconds. `DEDUP: KEEP IP`: 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. 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
+`RESOLVE ALL TO IP` (`-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).
 CLI: a hostname whose address collides with another host is dropped and not restored.
 Web GUI: colliding/unresolvable hosts are hidden (not pinged) while active, restored
 automatically when switching away.
+The web GUI mouse-over of a renamed host shows the hostname it had before (`hostname` row).
 
 CLI `P` and the web GUI's address mode select/`P` picker reach the same 4 exclusive
-modes: `HOSTNAME & IP` (default, no dedup), `PREFER HOSTNAME`, `PREFER IP ADDRESS`,
-`SWITCH TO IP ONLY`. The web GUI additionally has its own `P`/`I` keyboard shortcuts
-that toggle PREFER HOSTNAME / SWITCH TO IP ONLY directly (see *Web GUI*). Leaving
-`SWITCH TO IP ONLY` restores hostnames before applying the new mode.
+modes: `KEEP ALL (NO DEDUP)` (default), `DEDUP: KEEP HOSTNAME`,
+`DEDUP: KEEP IP`, `RESOLVE ALL TO IP`. The web GUI additionally has its own `P`/`I` keyboard shortcuts
+that toggle DEDUP: KEEP HOSTNAME / RESOLVE ALL TO IP directly (see *Web GUI*). Leaving
+`RESOLVE ALL TO IP` restores hostnames before applying the new mode.
 
 `GET NAMES`/`G` (`-gn`): reverse-DNS every raw IP with no hostname counterpart, renames
 on a PTR match (history/uptime carry over). Stays an IP if: no PTR record, name
@@ -677,7 +711,7 @@ dialog says so.
   No search in the CLI list.
 - **Banner**: while active the CLI banner shows e.g. `ADV Type not in (Firewall, Switch)`.
 - **Reset**: SET REFERENCE and CLEAR ALL turn the filter off. It is not saved
-  with `SAVE HOSTS FILE`.
+  with `SAVE HOSTS`.
 
 ## IPv6
 
@@ -691,20 +725,22 @@ other mask rejected. IPv6 addresses are always stored in shortest form.
 ## Diagnostics (`-dg`)
 
 ```
-FPING 11.46 [full 865(-r 3,-i 5ms) 4.31s  reduced 3242(-r 1,-i 1ms) 11.46s]
-   || DNS 0.00 STATE 0.01 BUILD 0.00 WAIT 0.50 DRAW 0.11
+FPING 34.11 [loop restarts=1 adds=0 pend=0 dnspend=0 abort=0 silent=0 young=0 30000(-r 4miss,-i 1ms) 34.11s]
+   || DNS 0.00 STATE 0.35 BUILD 0.01 WAIT 0.10 DRAW 0.11
 ```
 
-`FPING`: round wall time, then per-group wall time (parallel, max not sum). Remaining
-phases: eping's own work (~0.12s on 4109 hosts).
+`FPING`: wait for the snapshot, then engine counters: process restarts, added processes, hosts still without
+a new result (`pend`), names being resolved (`dnspend`), cut short by a command (`abort`), hosts DOWN by
+silence (`silent`), hosts in the grace period (`young`). Remaining phases: eping's own work.
+With `-debug` a round longer than 10 s is also logged as a `SLOW ROUND` comment with these times.
 
 ## Notes
 
 - ICMP echo requests only. Use only on authorised networks.
 - `-p` > 1 and `-i 0` reduce accuracy (false DOWN) — defaults avoid both.
-- `-dr 0` produces flapping hosts in practice — keep the default of 1.
+- Needs an fping with `-l` and per-target sequence numbers (fping 4.3 or newer; the Windows / macOS packages have it).
 
-# epinga.py 2.38
+# epinga.py 2.47
 
 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
@@ -716,6 +752,7 @@ always-UP/flapping/always-DOWN/no-DNS buckets.
 ./epinga.py                              # interactive menu - pick a *.csv
 ./epinga.py -f eping-log_2026-09-05.csv  # analyse a specific logfile
 ./epinga.py -f FILE --open               # analyse and open the report
+./epinga.py -f eping-log_...csv.zip      # a zipped logfile (one csv inside) is read directly
 ```
 
 Output: `<base>_report.txt` and `<base>_report.html` (`--html FILE` overrides).
@@ -730,6 +767,8 @@ Output: `<base>_report.txt` and `<base>_report.html` (`--html FILE` overrides).
 | `-e`, `--end YYYY-MM-DD HH:MM:SS` | rows up to this timestamp |
 | `-S`, `--sort {name,flapping,uptime,rtt}` | summary sort order (default `name`) |
 | `--source SOURCE` | only rows of this source - `local` or the jump host label from the log column `SOURCE` (repeatable; see *Source filter*) |
+| `--progress-file FILE` | write the progress (percent, remaining seconds, phase) as JSON to FILE - used by eping.py's GENERATE REPORT |
+| `--no-source-switch` | HTML report: do not embed one dataset per source (no source switch; faster on big multi-source logs) |
 | `--no-detail` | summary only |
 | `--no-changes` | omit state-change list |
 | `--html FILE` | custom HTML filename |
@@ -743,9 +782,17 @@ Logs written while eping.py ran on a jump host carry a `SOURCE` column. With `--
 selection shown on a terminal when the log holds several sources; numbers like `1,3`, ENTER = all)
 only the periods of the selected sources are calculated: uptime, up/down time, RTT, changes and the
 timeline. Periods of other sources are excluded and shown as a gap in the timeline; a state change that
-happened during such a gap is not counted. Without `--source` everything is combined (as before).
+happened during such a gap is not counted. Without `--source` everything is combined.
 Logs without a `SOURCE` column are treated as `local`.
 
+**Source switch in the HTML report**: if the (selected) sources are two or more, epinga analyses every source on
+its own as well and embeds these datasets in the same HTML file. A drop-down in the toolbar (`All sources
+(combined)` / `<label>`) switches the whole report - cards, host table, timelines, filters - to that
+source; the choice is kept in the URL (`#src=<label>`), a reload keeps it, sort/filter state is reset on a switch.
+The text report and the terminal output stay combined. Cost: one extra pass over the log per source and a
+correspondingly larger HTML file; `--no-source-switch` turns it off. A saved copy of the report (Download) opens
+on `All sources`.
+
 ![epinga report, source local](https://raw.githubusercontent.com/ewaldj/eping/main/docs/img/report-source.png)
 
 ## Called from eping.py