Travis Hegner
9a635e202b
Merge branch 'master' into lazyload
2015-06-30 10:09:28 -04:00
Travis Hegner
d8329f3a9c
no full-size-mode
2015-06-30 09:53:47 -04:00
Travis Hegner
b2e89a58ef
trying full-size-mode in the right place
2015-06-30 09:43:04 -04:00
Travis Hegner
885355f6c3
full not fill
2015-06-30 09:36:34 -04:00
Travis Hegner
df8c76ca4f
testing full-size-mode
2015-06-30 09:32:44 -04:00
Travis Hegner
63d50bf456
putting WxH back again
2015-06-30 09:11:32 -04:00
Clint Armstrong
b92e9f2d8f
Update to the freqency DS used in collectd > 5.0
...
Similar to #1347 and #1349
2015-06-30 07:46:09 -04:00
laf
a7d83be1af
Fixed API graphs not loading
2015-06-30 10:48:08 +01:00
Travis Hegner
d6fac9cc99
trying again without WxH on image
2015-06-29 17:03:38 -04:00
Travis Hegner
3927990617
trying to wrap overlib again for a different reason now
2015-06-29 15:53:24 -04:00
Travis Hegner
cd9287f23c
putting WxH back, but removing them via javascript after lazyloading finishes
2015-06-29 15:42:57 -04:00
Travis Hegner
0b97b9f2be
testing without img WxH attrs
2015-06-29 15:39:05 -04:00
Travis Hegner
c2b7161f17
putting back img WxH attrs
2015-06-29 15:30:30 -04:00
Travis Hegner
d767665cb0
testing without img WxH attrs
2015-06-29 15:26:04 -04:00
Travis Hegner
877fca845b
have to swap data-original and src for overlib to load correctly
2015-06-29 14:09:28 -04:00
Travis Hegner
63f7fc3056
testing without lazy on overlib
2015-06-29 14:05:20 -04:00
Travis Hegner
e397753f53
setting the correct wrapper function name
2015-06-29 13:59:37 -04:00
Travis Hegner
3597a948fd
trying to override overlib function
2015-06-29 13:44:19 -04:00
Travis Hegner
f86bbb96b0
can't execute code after a return
2015-06-29 13:32:22 -04:00
Travis Hegner
b92d637586
attempting to trigger ajaxStop via overlib
2015-06-29 13:30:45 -04:00
Travis Hegner
64a449b363
change src to 'data-original', adding binding function to document ready
2015-06-29 13:04:47 -04:00
Travis Hegner
e6ab9b4b60
had to pull WxH out into vars to use in the image tag
2015-06-29 12:54:31 -04:00
Travis Hegner
771c08f2e6
scratch that, reverse it
2015-06-29 12:49:39 -04:00
Travis Hegner
590063426c
testing with static graph WxH values
2015-06-29 12:48:19 -04:00
Travis Hegner
f9f9df2c0e
adding class and WxH attributes to graph images, adding jquery lazyload plugin
2015-06-29 11:12:28 -04:00
Travis Hegner
8e785ebaaa
Fix issue #1362 , added a line to reset , because the calling page is expecting new graphs, not appended ones
2015-06-29 10:34:03 -04:00
Neil Lathwood
aed0fedf02
Merge pull request #1349 from clinta/entropy-collectd
...
entropy DS name is value.
2015-06-26 16:29:15 +01:00
Neil Lathwood
322d6ecf1f
Merge pull request #1350 from clinta/urlencode-graphs
...
url encode graph names
2015-06-26 16:19:39 +01:00
Clint Armstrong
dbae0e371f
url encode graph names
2015-06-26 10:26:52 -04:00
Daniel Preussker
67a1463197
Merge pull request #1347 from clinta/apache-collectd
...
Correct Apache collectd DS
2015-06-26 16:24:38 +02:00
Clint Armstrong
02780b8e72
entropy DS name is value.
2015-06-26 08:02:20 -04:00
Clint Armstrong
523cb83e91
Correct Apache collectd DS
2015-06-26 07:50:37 -04:00
Clint Armstrong
dd5d1c5e05
Adding --daemon twice breaks collectd graphs
...
When using rrdcached [rrdtool.inc.php](includes/rrdtool.inc.php#L163) already adds the necessary options. Collectd.inc.php adds them again which breaks drawing the graphs.
2015-06-25 13:24:02 -04:00
Mike Rostermund
e769a4ffc6
Handle case where sensor_limit is not set for sensor_charge graphs
2015-06-25 03:47:20 -07:00
laf
820afa6dbb
Added logging of reason device was detected as down (icmp/snmp)
2015-06-22 22:11:02 +01:00
Neil Lathwood
8226e8b447
Merge pull request #1096 from laf/issue-1095-web
...
Added support for interval for alerting for WebUI
2015-06-20 01:56:08 +01:00
Neil Lathwood
3f2b49c72f
Fixed javascript issue preventing removing alert rules.
2015-06-20 01:29:01 +01:00
einhirn
94ea73a595
another minor correction about $port being undefined in some cases
2015-06-18 18:29:55 +02:00
einhirn
fdfe776c5a
minor correction about being undefined in some cases
2015-06-18 16:57:36 +02:00
einhirn
653696b949
fixed a bug where stale link/device data would lead to broken map
2015-06-18 16:32:01 +02:00
Daniel Preussker
559d6960c7
Merge pull request #1296 from SaaldjorMike/fix-legend-iflabels
...
Fix legend iflabels
2015-06-18 14:15:59 +00:00
Mike Rostermund
442f052265
Shorten the label shown on graph legend
2015-06-18 15:45:52 +02:00
Mike Rostermund
ec79e31827
Fix typo and reorder string replacements
2015-06-18 15:45:30 +02:00
Paul Gear
0eb3e69167
Fix Scrutinizer issues
2015-06-16 08:42:05 +10:00
Paul Gear
a02871263c
Fix up some unclear/missing copyrights
2015-06-16 08:27:58 +10:00
Paul Gear
d617aaacd0
Add graph type for MIB-based polling
2015-06-16 08:27:58 +10:00
Paul Gear
c873cafbae
Move client authorization checks to a separate function
2015-06-16 08:27:57 +10:00
Paul Gear
6038f11db9
phpcs run
2015-06-16 08:27:57 +10:00
Paul Gear
7ca0c54703
Add note about duplicate code
2015-06-16 08:27:57 +10:00
laf
6813c1face
updated alert template mapping to own table
2015-06-15 11:13:19 +01:00
Travis Hegner