Commit Graph

5049 Commits

Author SHA1 Message Date
f0o
a8e5880423
Fix logic bugs and strip %% 2015-05-11 13:09:51 +00:00
f0o
651f9d9d87
Added sanity check 2015-05-11 12:15:20 +00:00
f0o
25a9535b95
Rewrite rrdtool_escape 2015-05-11 11:22:36 +00:00
Neil Lathwood
828834b985 Merge pull request #959 from f0o/issue-443-reference-change
Change reference parameter for rrdtool's pipe_close to mitigate *some* zombies.
2015-05-11 10:28:28 +01:00
Neil Lathwood
78bd514303 Merge pull request #954 from mohshami/master
Fix install.php
2015-05-11 10:18:24 +01:00
f0o
d16784c040
This is not a fix for the issue!
It does however minimize the risk of running into zombies for certain distribution's php5.x packages.
It's been said it works for:
	Ubuntu 14.04.2 under Apache2's Mod-PHP using php5.5
	OpenSuSE 13.2 under Apache2's Mod-PHP using php5.6
	Debian 8 under Apache2's Mod-PHP and PHP-FPM using php5.6
2015-05-11 09:12:29 +00:00
Daniel Preussker
a5850226c4 Merge pull request #958 from mmarchand/searchbyname
allow to search a device by its hostname
2015-05-11 08:00:02 +00:00
Mickael Marchand
769f6b95c1 rewritten to check for input type 2015-05-11 09:43:20 +02:00
Mohammad Al-Shami
bdca04563c Add logic to handle the case where config.php cannot be written for some reason 2015-05-11 00:48:38 +03:00
Mohammad Al-Shami
9999d57a6b Merged changes with upstream and fixed AUTHORS.md
Merge remote-tracking branch 'upstream/master'
2015-05-11 00:29:34 +03:00
Mohammad Al-Shami
ed0218dba7 Uncommented second
$install_dir = array_pop($cur_dir);

line. Issue was happening because nginx doesn't add a trailing slash to DOCUMENT_ROOT. Simple change to nginx configuration adds that so no need to edit the code here.

Fixed conflict with AUTHORS.md
2015-05-11 00:09:14 +03:00
Neil Lathwood
ef8dcc2696 Merge pull request #957 from f0o/linux-ifname-fix
Fix a port-name issue for recent snmp versions for linux.
2015-05-10 18:33:08 +01:00
Mickael Marchand
af09cd1af9 allow to search a device by its hostname 2015-05-10 19:11:12 +02:00
Daniel Preussker
e4490f14a8 Merge pull request #956 from mmarchand/aggregate
Add aggregates on multi_bits_separate graphs
2015-05-10 17:06:00 +00:00
Mickael Marchand
55ee833e57 remove the headers if there is nothing to display below them 2015-05-10 18:44:49 +02:00
Mickael Marchand
cdd073a197 new noagg option to prevent displaying the aggregates 2015-05-10 18:36:15 +02:00
f0o
fe031b214e
Fix a port-name issue for recent snmp versions for linux. (Found in Debian Jessie) 2015-05-10 16:36:04 +00:00
Mickael Marchand
9de24dbe48 I agree to the conditions of the Contributor Agreement contained in doc/General/Contributing.md 2015-05-10 18:29:05 +02:00
Mickael Marchand
a43165ec1b fixed nototal option which was not properly set in common.inc.php
add new nodetails option to not display each device/port on the legend when graphing lots of devices
add new aggregates on multibits graphs
2015-05-10 17:52:46 +02:00
Neil Lathwood
960ecadf31 Merge pull request #955 from mmarchand/issue-948
Set $inverse to TRUE when the GET option is set
2015-05-10 16:44:50 +01:00
Mohammad H. Al-Shami
6e27d888c3 Update install.php to prevent creating an empty config.php file
I agree to the conditions of the Contributor Agreement contained in doc/General/Contributing.md.
2015-05-10 16:40:38 +03:00
Mickael Marchand
e93ca2b465 Set $inverse to TRUE when the GET option is set
Fixes #948
2015-05-10 13:20:24 +02:00
Neil Lathwood
31baee5e41 Merge pull request #952 from lasseleegaard/master
Update junos logo
2015-05-09 23:10:20 +01:00
Neil Lathwood
c35d683baf Merge pull request #953 from lasseleegaard/patch-1
I agree to the conditions of the Contributor Agreement
2015-05-09 23:10:03 +01:00
Lasse Leegaard
6b281479ce I agree to the conditions of the Contributor Agreement
I agree to the conditions of the Contributor Agreement contained in doc/General/Contributing.md.
2015-05-10 00:09:22 +02:00
Neil Lathwood
4bb05363a1 Merge pull request #947 from f0o/issue-923
Basic Ubiquiti EdgeSwitch implementation
2015-05-09 22:47:36 +01:00
Neil Lathwood
fef06b5f35 Merge pull request #946 from f0o/issue-945
Add port-rewrite options
2015-05-09 22:46:05 +01:00
Lasse Leegaard
830a02d4da Update junos logo
Update junos logo from old leaf logo to current star burst logo
2015-05-09 22:17:57 +02:00
Daniel Preussker
2705e53413 Merge pull request #949 from Ultra2D/issue-714
Issue 714
2015-05-09 19:17:39 +00:00
Ultra2D
05e3282cce Merge branch 'master' into issue-714 2015-05-09 17:17:51 +02:00
f0o
f9dd9c47c0
Basic Ubiquiti EdgeSwitch implementation 2015-05-09 12:49:22 +00:00
f0o
5ce9fbc388
Add port-rewrite options 2015-05-09 12:33:38 +00:00
Daniel Preussker
ff0c03b141 Merge pull request #944 from laf/issue-laf-926
Updated addhost.php to use distributed_poller_group if set
2015-05-09 09:59:54 +00:00
laf
8391a39f8f Updated addhost.php to use distributed_poller_group if set 2015-05-09 10:34:55 +01:00
Neil Lathwood
f6dba57c63 Merge pull request #943 from filippog/contributor
I agree to the conditions of the Contributor Agreement
2015-05-09 10:05:43 +01:00
Filippo Giunchedi
01107abeb8 I agree to the conditions of the Contributor Agreement 2015-05-09 11:02:45 +02:00
Paul Gear
395b33e4ac Merge pull request #942 from laf/issue-925
Added basic netgear detection
2015-05-09 07:41:04 +10:00
laf
a25fc0d507 Removed cpu / memory graphs 2015-05-08 21:27:16 +01:00
laf
606c81d023 Added basic netgear detection 2015-05-08 19:34:24 +01:00
Neil Lathwood
bed7c08ae2 Merge pull request #941 from f0o/issue-926
Set defaults for AddHost on xDP discovery
2015-05-08 18:54:32 +01:00
f0o
34f1f11923
Set defaults for AddHost on xDP discovery 2015-05-08 17:47:25 +00:00
Neil Lathwood
cc3a490ba9 Merge pull request #940 from f0o/issue-939
Minor fix to rrdcached_dir handling
2015-05-08 17:02:42 +01:00
f0o
1ed51dad65
Force relative rrd-paths by prefixing rrd_dir with './'
Allow empty string as rrdcached_dir values
2015-05-08 12:58:09 +00:00
Neil Lathwood
e0ac25fa66 Merge pull request #937 from f0o/issue-935
Change DB-Field `device_groups.pattern` from `varchar(255)` to `text`
2015-05-08 13:57:39 +01:00
Daniel Preussker
bf5ff217ce Merge pull request #938 from filippog/sentry_smart_cdu
sentry3: add Sentry Smart CDU detection
2015-05-08 12:39:21 +00:00
Filippo Giunchedi
fe1be15286 sentry3: add Sentry Smart CDU detection
The polled SNMP OIDs are the same as Switched CDU, thus match both.
2015-05-08 14:05:34 +02:00
f0o
73c5fee997
Change DB-Field device_groups.pattern from varchar(255) to text 2015-05-08 09:52:09 +00:00
Neil Lathwood
36da5311f3 Merge pull request #934 from f0o/issue-933
Add bills to rulesuggest, link to bills in alerts table and adds function`generate_bill_url`
2015-05-07 21:55:37 +01:00
f0o
ef74acb6cb
Adds:
`bills` to `html/ajax_rulesuggest.php`
	`generate_bill_url` to `html/includes/functions.inc.php`
	Link to bills in `html/includes/table/alerts.inc.php`
2015-05-07 20:43:02 +00:00
Neil Lathwood
48ea557c5a Merge pull request #932 from f0o/issue-931
Allow alerting on tables with relative/indirect glues.
2015-05-07 21:18:02 +01:00