Commit Graph

33 Commits

Author SHA1 Message Date
Nils Schneider 653ea4a301 Merge pull request #76 from freifunk-gluon/neighours
announce neighbours using alfred/gluon-announce
2015-03-24 20:56:39 +01:00
Nils Schneider 2e0e24a992 announce neighbours using alfred/gluon-announce
This adds a new announce.d datum "neighbours" (alfred 160) containing
information about mesh neighbours. It's intended to be an replacement
for batadv-vis.

In addition to the data already provided by batadv-vis it'll also
provide information about direct wifi neighbours.

Unlike batadv-vis, no data about clients is transmitted.

Sample data:

    {
      "wifi": {
        "90:f6:52:82:06:02": {
          "neighbours": {
            "f8:d1:11:2c:a7:d2": {
              "noise": -95,
              "inactive": 0,
              "signal": 0
            },
            "96:f6:52:ff:cd:6f": {
              "noise": -95,
              "inactive": 0,
              "signal": -37
            }
          }
        }
      },
      "batadv": {
        "90:f6:52:82:06:02": {
          "neighbours": {
            "96:f6:52:ff:cd:6f": {
              "lastseen": 2.8500000000000001,
              "tq": 177
            }
          }
        },
        "90:f6:52:82:06:03": {
          "neighbours": {
            "f8:d1:11:2c:a7:d3": {
              "lastseen": 2.3500000000000001,
              "tq": 206
            }
          }
        }
      },
      "node_id": "90f652820602"
    }
2015-01-24 12:12:53 +01:00
Matthias Schiffer 9b172bbaf4 Move all upgrade scripts to a common directory
Moving the scripts to a common directory not only vastly simplifies the
zzz-gluon-upgrade script, but also allows to define an ordering of such
scripts across packages.
2015-01-24 11:27:47 +01:00
flokli 63ff54e4bc gluon-announce: rename announce.lua to collect.lua
Signed-off-by: flokli <florian@darmstadt.freifunk.net>
2015-01-14 10:36:32 +01:00
Nils Schneider 14553d42be gluon-alfred: no parallel cronjobs
This should reduce memory consumption a little.

https://github.com/freifunk-gluon/gluon/issues/109#issuecomment-61681696
2014-11-17 15:36:06 +01:00
Nils Schneider 0a3bf70d56 split announce.d into nodeinfo + statistics 2014-07-20 14:00:10 +02:00
Nils Schneider 318e9d1a1d gluon-announce: detach announce.d from alfred
All announce.d scripts have been moved to /lib/gluon/announce/announce.d
The script /lib/gluon/announce/announce.lua will collect all information
and output json.
2014-07-11 14:43:47 +02:00
Matthias Schiffer 9a892e7948 gluon-alfred: use lua-platform-info 2014-07-10 17:57:31 +02:00
Matthias Schiffer 040a68ee65 gluon-alfred: some announce.lua cleanup 2014-06-26 17:57:15 +02:00
Nils Schneider d3d22a17d1 gluon-alfred: use gzip 2014-06-10 19:20:55 +02:00
Matthias Schiffer bc54f80dfd gluon-alfred: reduce usage of util.exec, improve table formatting 2014-06-10 15:44:35 +02:00
Matthias Schiffer ea7774c0b6 gluon-alfred: add fields idletime, memory and processes to statistics 2014-06-09 19:50:25 +02:00
Matthias Schiffer 48ea4b711f gluon-alfred: split announce.lua into several files and move parts into the appropriate packages
This also fixes the type of a few fields which were strings instead of numbers.
2014-06-09 19:23:16 +02:00
Nils Schneider 1269a7350e gluon-alfred: replace announce.sh with lua script
This replaces announce.sh with a lua script of (hopefully) equal
functionality. Using lua generating JSON is much faster than jshn and
allows for greater flexibility.
2014-03-01 23:47:03 +01:00
Matthias Schiffer 96b213c386 We DON'T want the gluon version file to collide with the package version stamp dir 2014-02-26 10:21:14 +01:00
Matthias Schiffer 7d27f1f045 gluon-alfred: add version string to software.firmware.base field 2014-02-25 11:38:06 +01:00
Matthias Schiffer c2cda254ae Rename gluon-location to gluon-node-info, add owner section 2014-02-24 05:12:01 +01:00
Matthias Schiffer 59c1900e9a gluon-location: move information to /etc/config/gluon-location 2014-01-20 00:06:55 +01:00
Matthias Schiffer 086efed428 gluon-alfred: add chosen gateway and load average 2014-01-19 21:44:26 +01:00
Matthias Schiffer 74493b2ba5 gluon-alfred: run every minute
The run frequency and exact time affect the alfred announce interval, so we can
just run it every minute to supply alfred with the most up-to-date data.
2014-01-18 21:56:05 +01:00
Jan-Philipp Litza 4b61062636 alfred: add more traffic statistics
+ mgmt and forward counters
+ packet in addition to byte counters for everything
2014-01-16 23:47:41 +01:00
Jan-Philipp Litza 7fdd0300b2 alfred: Add --no-sleep option to send immediately 2014-01-16 23:46:54 +01:00
Jan-Philipp Litza 692f093d21 alfred: clean up delay code 2014-01-16 22:42:02 +01:00
Jan-Philipp Litza cc2ef851c7 alfred: add random node-specific delay before sending 2014-01-16 22:36:09 +01:00
Jan-Philipp Litza 50782f759e alfred: make traffic counters absolute
After a lenghty discussion, we settled on absolute vs. relative values.
Main reasons:

* stateless implementation on node possible
* convertable to relative values by differentiaion on receiver
* missed transmissions only decrease granularity, whereas relative
  values would introduce wrong numbers on integration if values are
  missed
2014-01-16 22:34:57 +01:00
Jan-Philipp Litza 6bf44622dc alfred: add statistics (uptime+traffic) 2014-01-16 16:50:25 +01:00
Matthias Schiffer d204b0e24f Remove initscript enable/disable hacks
Better configure these properly.
2014-01-13 18:29:00 +01:00
Jan-Philipp Litza a3f2eb6bc7 alfred: name -> hostname 2014-01-13 17:11:41 +01:00
Jan-Philipp Litza 59616e8d77 alfred: improved readability 2014-01-13 17:09:15 +01:00
Jan-Philipp Litza e901ceda71 alfred: split up firmware info, include fastd version+status 2014-01-13 17:06:47 +01:00
Jan-Philipp Litza d0e3cbc8bc alfred: added more information to send, reformatted location
location is object with latitude and longitude
added:
* firmware
* autoupdater status
* hardware model
* primary mac address
* mesh IPv6 addresses
2014-01-13 16:10:03 +01:00
Matthias Schiffer d1f01a588f Clean up gluon-alfred
* Merge gluon-alfred-ffmap into gluon-alfred
* Use gluon-crond instead of alfred's "facter" mechanism based on the broken busybox crond
2014-01-12 22:37:28 +01:00
Jan-Philipp Litza dece1f4122 added gluon-alfred and gluon-alfred-ffmap 2014-01-12 22:06:50 +01:00