Commit Graph
15 Commits
Author SHA1 Message Date
Hannu Nyman 34e875b3d3 firewall: validate max length of zone name
fw3 sets the maximum length of the zone name to 14 and
ignores zone definitions with too long names.
http://nbd.name/gitweb.cgi?p=firewall3.git;a=blob;f=zones.h;hb=HEAD#l25
http://nbd.name/gitweb.cgi?p=firewall3.git;a=blob;f=zones.c;hb=HEAD#l195

Add a simple validation to ensure that the new zone name is short enough.
This should fix issue #345

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-08-26 13:55:26 +03:00
Hannu Nyman 9a06498dbd statistics: memory plugin - improve graph by better scaling of y-axis
Utilise alt_autoscale_max to make the memory chart y-axis to scale better
for devices with e.g. 128 MB RAM.

Also fix the axis min value to 0.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-08-23 21:12:56 +03:00
Hannu Nyman 86ff4bd3a4 statistics: support rrdtool's alt_autoscale and alt_autoscale_max options
Implement support for alternative scaling of the y-axis.
By default, rrdtool will autoscale to 1,2,5,10,20,50,100,200,... etc.,
which is not always suitable (e.g. memory charts for device with 128 MB).

Rrdtool 1.0.50 already supports alternative autoscaling that creates
a tighter y-axis. Implement graph-level options in Luci statistics to
support those boolean options as "alt_autoscale" and "alt_autoscale_max".

info at http://oss.oetiker.ch/rrdtool/doc/rrdgraph.en.html

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-08-23 21:02:14 +03:00
Hannu Nyman 962cd2c4c1 statistics: cpu graph - add label definitions, add softirq and interrupt stats
CPU plugin in the Luci statistics was missing the label definitions,
so the field labels are like "cpu_system" instead of "System".
Add proper label definitions to CPU (like the other plugins already have).

The statistics graph was also missing softirq and interrupt stats, although colors
for them were defined. Softirq consumes massive amount of CPU especially with
any qos in use, so it is important for the user to see also that data. Add both
softirq and interrupt stats to the graph.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-08-23 17:14:22 +03:00
Hannu Nyman b7b6ed740b statistics: fix ping graph label regression
Earlier update to collectd 5.4.1 changed the field from "ping" to "value",
which was changed in the graph definition here, but the label definition
was forgotten. Field's label now reads "ping_IPaddr_value".

Correct the label definition to show only IPaddr like the other two graphs.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-08-19 10:56:30 +03:00
Hannu Nyman ff9da6cb76 statistics: fix conntrack regression caused by collectd 5.5.0
Collectd 5.5.0 introduced new data to conntrack plugin:
In addition to the number of tracked connections there is also
the static max conntrack value and the calculated use percentage.

Luci's conntrack plugin intrepretes "conntrack-max" as a new data instance
and includes it in the graph in addition to the real "conntrack" number.

Eliminate "max" from graph by specifying empty "" instance as data source.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-08-18 23:05:00 +03:00
Hannu Nyman d63a7cb582 Timezone information: update to 2015f
Changes in 2015e and 2015f:
http://mm.icann.org/pipermail/tz-announce/2015-June/000032.html
http://mm.icann.org/pipermail/tz-announce/2015-August/000033.html

     Morocco will suspend DST from 2015-06-14 03:00 through 2015-07-19 02:00,
     not 06-13 and 07-18 as we had guessed.

     Assume Cayman Islands will observe DST starting next year, using US rules.
     Although it isn't guaranteed, it is the most likely.

     North Korea switches to +0830 on 2015-08-15.
     The abbreviation remains "KST".

     Uruguay no longer observes DST.

     Moldova starts and ends DST at 00:00 UTC, not at 01:00 UTC.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-08-17 22:53:11 +03:00
Hannu Nyman 1d477abc54 luci-app-qos: remove l7 options
Cleanup luci-app-qos, as it still contains references to l7 functionality
that has been removed both from kernel and from qos-scripts.

Qos config page has a non-functional "Service" option and every visit to
qos config page generates currently an error as no l7 files can be found.
   daemon.err uhttpd[2285]: find: /etc/l7-protocols/: No such file or directory

Patch removes "Service" option and the l7 file search.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-06-06 10:41:23 +03:00
Hannu Nyman c7a6830536 Timezone information is updated to 2015d, released on 24 Apr 2015.
I used build/zoneinfo2lua.pl to pull data from my Ubuntu 15.04.

Changes in 2015d are rather small:
http://mm.icann.org/pipermail/tz-announce/2015-April/000031.html

   Changes affecting future time stamps
     Egypt will not observe DST in 2015 and will consider canceling it
     permanently.  For now, assume no DST indefinitely.

   Change affecting time zone abbreviations
     The abbreviations for Hawaii-Aleutian standard and daylight times
     have been changed from HAST/HADT to HST/HDT, as per US Government
     Printing Office style.  This affects only America/Adak since 1983,
     as America/Honolulu was already using the new style.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-05-23 17:34:13 +03:00
Hannu Nyman 4d18e09e05 Timezone data: Update to 2015c
Timezone information is updated to 2015c, released on 14 Apr 2015.

I used build/zoneinfo2lua.pl to pull data from my Ubuntu 14.10.

Changes in 2015b and 2015c are rather small:
http://mm.icann.org/pipermail/tz-announce/2015-March/000029.html
http://mm.icann.org/pipermail/tz-announce/2015-April/000030.html

     Mongolia will start observing DST again this year, from the last
     Saturday in March at 02:00 to the last Saturday in September at 00:00.

     Palestine will start DST on March 28, not March 27.  Also,
     correct the fall 2014 transition from September 26 to October 24.
     Adjust future predictions accordingly.

     Egypt's spring-forward transition is at 24:00 on April's last Thursday,
     not 00:00 on April's last Friday.  2015's transition will therefore be on
     Thursday, April 30 at 24:00, not Friday, April 24 at 00:00.  Similar fixes
     apply to 2026, 2037, 2043, etc.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-04-19 10:48:03 +03:00
Hannu Nyman 83973f28c3 luci-statistics: fix uhttpd log spam from extra png close
Fix log spam that uhttpd logging change has brought to surface.

Sun Mar  1 11:10:42 2015 daemon.err uhttpd[2293]: /usr/lib/lua/luci/dispatcher.lua:433: Failed to execute call dispatcher target for entry '/admin/statistics/graph/conntrack'.
Sun Mar  1 11:10:42 2015 daemon.err uhttpd[2293]: The called action terminated with an exception:
Sun Mar  1 11:10:42 2015 daemon.err uhttpd[2293]: .../luci/controller/luci_statistics/luci_statistics.lua:153: attempt to use a closed file

Closing the png file explicitly on line 153 is unnecessary, as
ltn12's source.file method already closes the file after use.
https://github.com/openwrt/luci/blob/master/modules/luci-base/luasrc/ltn12.lua#L119

More info at https://dev.openwrt.org/ticket/19083#comment:2

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-03-02 19:04:16 +02:00
Hannu Nyman cdb9de9a9d zoneinfo2lua.pl to generate shorter copyright messages
Change zoneinfo2lua.pl to generate the short copyright messages
that have been there since https://github.com/openwrt/luci/commit/7a3493b1f7d75a3945279115324cf2ff4da26b7b

Also change the advice on line 3 about directory, where this script
should be run.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-02-04 19:16:46 +02:00
Hannu Nyman fd1042f5ee Timezone data: Update to 2015a
Timezone information is updated to 2015a, released on 30 Jan 15.

I used build/zoneinfo2lua.pl to pull data from my Ubuntu 14.10.

Changes are rather small:
http://mm.icann.org/pipermail/tz-announce/2015-January/000028.html

The Mexican state of Quintana Roo, represented by America/Cancun,
will shift from Central Time with DST to Eastern Time without DST.

Chile will not change clocks in April or thereafter; its new
standard time will be its old daylight saving time.
This affects America/Santiago, Pacific/Easter, and Antarctica/Palmer.

Ps. I manually edited headers to have the shorter new copyright,
instead of the long one generated buy the script.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-02-04 18:50:36 +02:00
Hannu Nyman 36357529a0 Update timezone info to 2014i (from 2011n)
Timezone information embedded in Luci is updated to 2014i.
Afaik, the old data was from version 2011n.

I used build/zoneinfo2lua.pl to pull data from my Ubuntu 14.10 buildhost
that contains 2014i version of the timezone data.

2014j has been released this week, but is not yet embedded in Ubuntu and
Turks&Caicos is the only affected country/zone.
2014i: http://mm.icann.org/pipermail/tz-announce/2014-October/000026.html
2014j: http://mm.icann.org/pipermail/tz-announce/2014-November/000027.html

This update should fix Openwrt bugs #11445 and #18323.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2014-11-14 17:06:30 +02:00
Hannu Nyman 2a0e842d00 wifi.lua: Add support for toggling WPS button.
The patch checks the existence of the needed files for the WPS support and if they are present, shows the option to toggle WPS pushbutton settings.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2014-10-10 15:48:54 +03:00