| Message ID | 1506985447-3940-1-git-send-email-freifunk@adrianschmutzler.de |
|---|---|
| State | Accepted |
| Headers | show |
diff --git a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher index f9d6e65..35adf91 100755 --- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher +++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher @@ -56,6 +56,8 @@ crawl() { #Get system data from other locations err "$(date): Collecting basic system status data" hostname="$(cat /proc/sys/kernel/hostname)" + mac=$(awk '{ mac=toupper($1); gsub(":", "", mac); print mac }' /sys/class/net/br-mesh/address 2>/dev/null) + [ "$hostname" = "LEDE" ] && hostname="$mac" description="$(uci get system.@system[0].description)" if [ -n "$description" ]; then description="<description><![CDATA[$description]]></description>"
Morgen.. Reviewed-by: Tim Niemeyer <tim@tn-x.org> Tim Am 3. Oktober 2017 01:04:07 MESZ schrieb Adrian Schmutzler <freifunk@adrianschmutzler.de>: >Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> >--- > src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher | 2 ++ > 1 file changed, 2 insertions(+) > >diff --git >a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher >b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher >index f9d6e65..35adf91 100755 >--- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher >+++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher >@@ -56,6 +56,8 @@ crawl() { > #Get system data from other locations > err "$(date): Collecting basic system status data" > hostname="$(cat /proc/sys/kernel/hostname)" >+ mac=$(awk '{ mac=toupper($1); gsub(":", "", mac); print mac }' >/sys/class/net/br-mesh/address 2>/dev/null) >+ [ "$hostname" = "LEDE" ] && hostname="$mac" > description="$(uci get system.@system[0].description)" > if [ -n "$description" ]; then > description="<description><![CDATA[$description]]></description>"
Am Dienstag, den 03.10.2017, 08:04 +0200 schrieb Tim Niemeyer: > Morgen.. > > Reviewed-by: Tim Niemeyer <tim@tn-x.org> Und applied. Tim > > Tim > > Am 3. Oktober 2017 01:04:07 MESZ schrieb Adrian Schmutzler <freifunk@ > adrianschmutzler.de>: > > Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> > > --- > > src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git > > a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher > > b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher > > index f9d6e65..35adf91 100755 > > --- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher > > +++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher > > @@ -56,6 +56,8 @@ crawl() { > > #Get system data from other locations > > err "$(date): Collecting basic system status data" > > hostname="$(cat /proc/sys/kernel/hostname)" > > + mac=$(awk '{ mac=toupper($1); gsub(":", "", mac); print mac }' > > /sys/class/net/br-mesh/address 2>/dev/null) > > + [ "$hostname" = "LEDE" ] && hostname="$mac" > > description="$(uci get system.@system[0].description)" > > if [ -n "$description" ]; then > > description="<description><![CDATA[$description]]></descriptio > > n>"
Beim 1043v5 sieht man schön, das nun tatsächlich die MAC als Standardname beim Monitoring landet: https://monitoring.freifunk-franken.de/routers/59e92c389369c3493aca9151 Screenshot im Anhang. Grüße Adrian > -----Original Message----- > From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf > Of Tim Niemeyer > Sent: Samstag, 14. Oktober 2017 17:39 > To: franken-dev@freifunk.net; Adrian Schmutzler > <freifunk@adrianschmutzler.de> > Subject: Re: [PATCH] fff-nodewatcher: Use mac address instead of standard > node name > > Am Dienstag, den 03.10.2017, 08:04 +0200 schrieb Tim Niemeyer: > > Morgen.. > > > > Reviewed-by: Tim Niemeyer <tim@tn-x.org> > > Und applied. > > Tim > > > > > Tim > > > > Am 3. Oktober 2017 01:04:07 MESZ schrieb Adrian Schmutzler <freifunk@ > > adrianschmutzler.de>: > > > Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> > > > --- > > > src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher | 2 ++ > > > 1 file changed, 2 insertions(+) > > > > > > diff --git > > > a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher > > > b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher > > > index f9d6e65..35adf91 100755 > > > --- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher > > > +++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher > > > @@ -56,6 +56,8 @@ crawl() { > > > #Get system data from other locations > > > err "$(date): Collecting basic system status data" > > > hostname="$(cat /proc/sys/kernel/hostname)" > > > + mac=$(awk '{ mac=toupper($1); gsub(":", "", mac); print mac }' > > > /sys/class/net/br-mesh/address 2>/dev/null) > > > + [ "$hostname" = "LEDE" ] && hostname="$mac" > > > description="$(uci get system.@system[0].description)" > > > if [ -n "$description" ]; then > > > description="<description><![CDATA[$description]]></descriptio > > > n>"
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> --- src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher | 2 ++ 1 file changed, 2 insertions(+)