Sync translations to the current strings.
Changes in luci-app-ddns, luci-app-mjpg-streamer, luci-app-qos,
luci-app-shadowsocks-libev, luci-app-statistics and luci-base
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Due to a lack of a test environment this support only covers thermal graphs
so far. Please send the output of "rrdtool info /tmp/rrd/*/sensors-*/*.rrd"
if your system happens to support voltage, power or fanspeed sensors.
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
If a plugin produces only one instance, e.g. netlink with just one interface
configured, then the controller will register no detail views which would
normally show all graphs but the index pacage of a given plugin will still
display the collapsed view without any possibility to reach the full listing.
Fix the problem by only rendering a linked index view when more than one
instance is present.
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
Reorganise the menu items of the Luci statistics module:
* Re-label "Collectd" to "Setup" and place it after the "Graphs" items.
- "Graphs" is used much more frequently so it should be first.
- Change "Collectd" menu item to "Setup" to clarify things.
* Re-label "System plugins" to "General plugins" to change sorting.
"Network / Output / System" changes to "General / Network / Output"
that is more logical order for the items.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
At some point since I last checked, the nut plugin for collectd changed the
names of the timeleft and percent datasets. Update the luci module to match
so that those graphs are generated correctly again.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Switch the zonename validation to use
a compound datatype "and(uciname,maxlength(14))"
instead of a separate 'validate' function.
Remove the unnecessary function that was introduced by 34e875b
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Both init.d and uci-defaults scripts included in luci-app-statistics
still contained stuff related to lucid, which package was removed by
91b97bc9f6
Changes to scripts:
* init.d: lucid reference removed,
/var/etc creation moved earlier (before first possible use)
* uci-defaults: lucid parameters & restart removed
(but busybox httpd stuff was left intact, although it might be unnecessary)
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Mark luci-app-multiwan @BROKEN, as it depends on the old 'multiwan'
package, located in the deprecated 'oldpackages' feed.
'packages' feed contains both 'mwan3' and 'luci-app-mwan3' apps that
have superseded the old packages.
This should fix#395.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Adjust default settings to match the plugins installed by default
(default plugins: iwinfo, interface, load)
* disable plugins not installed by default to avoid error messages at start
* remove references to Freifunk interfaces, as most users do not have those
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
No functional changes, but the file is reorganised:
* group settings: general settings / output plugins / input plugins
* sort settings inside a group
* remove quotes from option names to match the current uci behaviour
* whitespace corrections
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Clarify the CPU time consumption graph by removing the "idle" data from it.
Especially with light traffic, removing "idle" enables the graph
to scale better and to properly show the CPU load variations.
If "idle" data needs to be seen, it might be added as a second graph below.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
* Clarify the short explanation on the statistics section's front page.
* Mention the possibility of additional collectd plugins to get more stats.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
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>
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>
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>
This is useful in client mode as well, since it allows one to use --route-noexec and --up <cmd> or --route-up <cmd> to create routes manually instead of relying on whatever routes vpn server pushes down to the client.
mode=server dependency in luci was introduced together with script_security by mmunz back in 2011.with no explanation in the commit why mode=server was there.
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>
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>
The regex used to process the iface query string argument in
vnstat.htm was stripping underscores, which caused the graph not to
display for interfaces with names containing underscores. This
patch adds the underscore to that regex so that the interface name
will be correct and the graph will be displayed.
Signed-off-by: Michael Marley <michael@michaelmarley.com>
Stop sys upgrade automatically disabling miniupnpd on first boot after upgrade.
I spent a lot of time tracking this behaviour down which only occurs if you have luci-app-upnp installed.
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>
fixed version checking in function ipkg_ver_compare()
Reported issue #387 and openwrt/packages issue 1285
Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
* reflect updated language file for zh-cn
* change default for retry_count to 0 compatible to ddns-scripts 2.4.2-1
* addition to retry_count help description
* modified dependency on ddns-scripts 2.4.2-1
Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
New Application
!!! Dependency not set because there are two packages "radicale-py2" and
"radicale-py3" (currently BROKEN) available !!!
Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
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>
* remove extra apperror.lua page
* so no nore need for extra directory inside model/cbi
* add option temporary_directory needed for external filters
* remove special handling of bootstrap theme #298#334
* modified version handling suggested in #335
Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
* remove usage of opkg via system call for version handling
thanks to Jo-Philipp Wich #335
* remove special handling of bootstrap theme #298#334
Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
Current OpenWrt trunk now relays uhttpd stderr to syslog, so don't spam
it with "iptables: No chain/target/match by that name." when miniupnpd
is not configured but its status is queried by an overview page applet.
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
- implement new option bind_interface
- fixes problems when updating status displays (i.e. showing Software update needed)
- new links to OpenWrt wiki
- new screen to set global settings
- implements global option use_curl
Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
* move from openwrt/packages to openwrt/luci
* adaption to new LuCI subdirectory structure
* fix error handling
* modified version handling
* fixed translations
Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
- adaption Makefile to changed luci.mk
- description in Makefile for correct version handling
- modified handling to detect and display installed version
- new functions ipkg_ver_installed() and ipkg_ver_compare
- correct wrong spellings
- modified language template and German translation
Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
- adaption to LuCI's new directory structure on github
- adaption to LuCI's new Makefile optional settings
- remove CHANGELOG from github
- directory structure cleanup
not all patches of 2.1.0-3 and before were applied to new directory
structure
Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
* Rename subdirectories to their repective OpenWrt package names
* Make each LuCI module its own standalone package
* Deploy a shared luci.mk which is used by each module Makefile
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
- modified controller
-- remove support for ddns-scripts Version 1.x
-- ddns-scripts not correctly installed do not start
-- no config file create an empty one
- moved log settings to advanced tab
- set default syslog level "Notice"
- removed special handling for dynamic_dns_helper.sh in postinst
Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
- moved /usr/lib/ddns/dynamic_dns_lucihelper.sh to ddns-scripts package
- fixed error message when validating proxy
- modified validating ip_script to allow the usage of parameters
- using ipkg/postinst AND ipkg/postinst-pkg as long as LuCI Makefiles did not
fullfil requirements of new OpenWrt default_postinst and default_postrm
reported in Issue #255
- cleanup whitespaces at line ends
Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
fix verify of entry for DNS server Issue #244https://github.com/openwrt/luci/issues/244
add support for option 'update_script'
add display of version information when click on "Dynamic DNS" on
overview page
add verify of installed ddns-scripts version and show as hint if not
correct version
modified epoch to date conversation
cbi object Flag did not set section.changed state, fixed in
tools.flag_parse function
ucitrack entry no longer needed and removed
minor fixes
Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
extends/replaces exising luci-app-ddns to support ddns-scripts starting
Version 2.0.1-8
Still supports ddns-scripts Version 1.0.0-23 with the old interface
including fix for OpenWrt Ticket #18018.
Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
[PATCH 1/2] [packages] collectd: Update luci-statistics / collectd to 5.4.1 -
packages
[PATCH 2/2] [luci] collectd: Update luci-statistics / collectd to 5.4.1 - Luci
Collectd, the backbone of Luci statistics module, has been recently updated
already to 5.4.1, while Openwrt is still with 4.10.8.
5.0-5.4 branches have been released in 2011-2013 and the last Collectd
release in January 2014 only contained 5.4.1. 4.10.x is being "phased out"
and new commits have been made only rarely. No 4.10.x release for ages.
My ar71xx/wndr3700 build has been using 5.4.1 since March (and used 5.3.1
long before that).
I have compile-tested (with ar71xx) all collectd modules, and I have verified
the real-life functionality of the following plugins: Conntrack,
CPU/Processor, DNS, Interfaces, Memory, Ping, Processes, TCP Connections,
System Load, Uptime, Wireless.
The version bump requires changes both to "collectd" in the packages feed and
to "luci-statistics" in the luci feed, as some of the data items have changed
name or file structure.
I am including two separate patches: one for collectd in packages and one for
luci-statistics in Luci trunk.
Collectd:
Explanation of main changes in the patches for collectd in packages feed:
Patches to be removed:
- 120-fix_kernel_2.6.37.patch is unnecessary. The file to be patched has been
removed upstream.
- 130-timeleft-max.patch is included upstream. Patch removed.
http://git.verplant.org/?p=collectd.git;a=commitdiff;h=d5b09f2bb673ac9396da52b85bcbd16c98b3d633
Changed patches:
- 003-remove-werror.patch: Quilt choked on some -Werror related changes, so I
removed them.
- 900-add-iwinfo-plugin.patch: Changed to patch configure.ac instead of
configure.in
New patches:
- 140-fix-fqdnlookup.patch : FQDNLookup option has been turned on by default
since 5.1. If that option is enabled, it causes collectd to refuse to start
in a basic Openwrt box as typically a fully qualified domain name does not
exist for the router. (That error related can only be properly seen when
console is used to start collectd. Otherwise Luci statistics collectd simply
dies immediately after starting it.) That option should be false by default.
I included a new patch 140-fix-fqdnlookup.patch to turn the option off by
default.
http://git.verplant.org/?p=collectd.git;a=commit;h=e58f85bb68b4c45130bb6fdf40b51db95d2b71e5
- 150-fix-interface-af-link : a FreeBSD10-specific change broke build for me,
so I reverted the change.
http://git.verplant.org/?p=collectd.git;a=commitdiff;h=645dadb3fcc466e8880fda4eb23b21ad433631fc
- 905-disable-sigrok-glib: libsigrok checks for a glib-related macro that
breaks configure. Bypass the invalid macro. I have also added a disabling
option in Makefile.
Luci:
Data presentation in luci-statistics requires three changes in the Luci sources:
-conntrack result data has changed name from "entropy" to "value".
-ping result data has changed name from "ping" to "value".
http://git.verplant.org/?p=collectd.git;a=commitdiff;h=77a6905147798210ec17173bd5e4410adcc3a112
-interface plugin has changed rrd data file structure so that the plugin
instances (=interfaces) have separate data files. Luci needs to draw the
graph for each plugin instance, not for each data instance.
http://git.verplant.org/?p=collectd.git;a=commitdiff;h=cc3640ba512862cd5745446f1f1a997dd4344454
My previous patches for upgrading to earlier 5.x series can be marked as
superseeded in Patchwork.
http://patchwork.openwrt.org/patch/2457/http://patchwork.openwrt.org/patch/3300/http://patchwork.openwrt.org/patch/4204/http://patchwork.openwrt.org/patch/4205/
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
NEVER enable_debug from LuCI, because hd-idle goes into
foreground/console mode and LuCI will hang during "Save&Apply" forever.
This parameter should be removed completely. Also not being availible
inside OpenWrt's init script. If you reboot, hd-idle blocks the boot
process because it's not going to background.
Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
collectd-mod-uptime is already there, but there has been no Luci support for
it, so no graphs are shown.
Based on forum discussion (see
https://forum.openwrt.org/viewtopic.php?id=42478 ), I submit a patch to add
the support to luci-statistics.
Patch is for Luci trunk and the functionality can be enabled by selecting
collectd-mod-uptime in menuconfig.
signed-off-by: hannu.nyman@iki.fi
- now escaping special characters in pbx-asterisk
- changed location of voicemail temp stuff and log file
- changed pbx-send-voicemail to use base64 instead of uuencode
- added many missing dependencies
- now allowing ip addresses as well as hostnames for external host
- constrained # seconds to ring to positive integers
- specifying externrefresh in sip.conf template
- fixed voicemail (sending recordings, recording new greeting, instructions)
- Implemented callback
Converting NaN to zero for the sake of the cumulative stack in non-overlay
mode is all very well. But we shouldn't then use that for displaying the
graph. Make another variable %s_plot which *preserves* NaN from the input
data, and then we don't get bogus data points drawn. Especially at the end
of the graph this was problematic.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
