Commit Graph
17185 Commits
Author SHA1 Message Date
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
mfeerick 5700efe8f6 Fix tooltip position in absolutely positioned elements 2015-05-08 14:22:29 +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 GiunchediandFilippo 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
f0o 6ab9b9727e Make scrut happy 2015-05-07 20:05:47 +00:00
f0o 740e85a1ba Fix silly SQL bug 2015-05-07 19:56:05 +00:00
Daniel Preussker 365f3c6ca5 Merge pull request #928 from laf/oxidized-api
Added API to feed into Oxidized
2015-05-07 14:36:24 +00:00
f0o fadaffac21 Allow alerting on tables with relative/indirect glues.
This commit introduces a lookup using an adaption of left/right expansion searches to find a missing glue-column across several layers of relations.
You can now alert on data having a glue mapped to other entities as long as it resolves to 'device_id' in under 30 cycles.
First intention of usage is to alert on bill-usages.
The bills-table does not contain a valid 'device_id' glue and has to be resolved via 'bills.bill_id -> bill_ports.port_id -> ports.device_id'.
This example consumes 3+1 cycles.
2015-05-07 14:22:16 +00:00
Gianluca Arbezzano e369530539 Remove filters 2015-05-07 14:51:26 +02:00
Neil Lathwood 9b637b0bc9 Merge pull request #930 from f0o/issue-929
Allow per-OS definitions of bad_iftype, bad_if, bad_if_regexp
2015-05-07 12:26:42 +01:00
f0o 0279c0f76e Allow per-OS definitions of bad_iftype, bad_if, bad_if_regexp
Supported:
```php
	$config['os'][$os]['bad_if'][] = '...';
	$config['os'][$os]['bad_if_regexp'][] = '...';
	$config['os'][$os]['bad_iftype'][] = '...';
```
Best to be used in `includes/definitions.inc.php`
2015-05-07 10:24:26 +00:00
Daniel Preussker ddc1d05262 Merge pull request #927 from laf/oxidized
Oxidized support for device config
2015-05-07 06:15:25 +00:00
laf f5d02ab18d Added API to feed into Oxidized 2015-05-07 00:32:58 +01:00
laf d4ca6975cd Added config options for Oxidized 2015-05-06 22:57:31 +01:00
laf dc0d12936c Added support for Oxidized 2015-05-06 22:52:54 +01:00
Daniel Preussker 7f5a64967e Merge pull request #922 from laf/docs-auth
Added docs on using varying authentication types
2015-05-06 13:41:09 +00:00
laf 6ef66cc15d Added missing to 2015-05-06 11:22:50 +01:00
Daniel Preussker 87095c7a64 Merge pull request #921 from laf/devices-fix
Another tweak to SQL query for devices
2015-05-06 08:22:45 +00:00
Daniel Preussker 774e11b5a1 Merge pull request #920 from laf/issue-902
Updated install docs to advise about whitespace in config.php
2015-05-06 06:04:36 +00:00
Daniel Preussker 6819acf46f Merge pull request #919 from laf/docs-devel
Updated development docs
2015-05-06 06:03:56 +00:00
laf 3143018d22 Added docs on using varying authentication types 2015-05-06 01:44:22 +01:00
laf 9d6f20ccf1 Another tweak to SQL query for devices 2015-05-05 23:54:36 +01:00
laf e4405dbbe3 Added missing ? character 2015-05-05 22:58:58 +01:00