Commit Graph

7412 Commits

Author SHA1 Message Date
Paul Gear
5d3701e3a6 Update install.php
spelling
2015-08-11 08:39:14 +10:00
Daniel Preussker
e8a74e17a6 Merge pull request #1651 from laf/location-fix
Fixes issues with addresses having ' in
2015-08-09 21:35:46 +00:00
Daniel Preussker
249e89f09d Merge pull request #1649 from arnoldthebat/issue-1648
Fixed Synology System Temerature being overwritten
2015-08-09 21:35:14 +00:00
laf
11b708c102 Fixes issues with addresses having ' in 2015-08-09 21:17:54 +00:00
tony Ditchfield
ae6e01e195 Resigning 2015-08-09 19:31:46 +01:00
tony Ditchfield
81ed33ee71 Fixed Synology System Temerature being overwritten 2015-08-09 19:10:48 +01:00
Daniel Preussker
15a338061d Merge pull request #1582 from laf/issue-1461-old
Updated network to support old style format, docs provided
2015-08-09 12:10:08 +00:00
Daniel Preussker
25f64d5fc7 Merge pull request #1606 from laf/billing-api-fix
Billing API Scrut fixes
2015-08-09 10:46:16 +00:00
Daniel Preussker
6b020e0d82 Merge pull request #1613 from laf/issue-1524
Added edit page to update storage percent warn value
2015-08-09 09:26:17 +00:00
laf
ca60b5268a Scrut fix 2015-08-09 09:22:48 +00:00
Daniel Preussker
6b91456eb6 Merge pull request #1638 from laf/strict-fixes
Two fixes for mysql strict mode
2015-08-09 09:19:07 +00:00
Daniel Preussker
442af615ba Merge pull request #1646 from laf/alert-widget-fix
Updated gridster variables to be custom per widget
2015-08-08 09:47:37 +00:00
laf
75a7f4833e Updated gridster variables to be custom per widget 2015-08-08 09:43:28 +00:00
Daniel Preussker
904a2099b5 Merge pull request #1643 from infernix/ifalias-null-reorder
Reorder ifalias_null check to prevent var flapping
2015-08-07 17:37:42 +00:00
Daniel Preussker
c1b481b579 Merge pull request #1644 from laf/install-fix
Fixed web installer + made the mysql import message stronger
2015-08-07 16:21:14 +00:00
laf
021ada79cf Fixed web installer + made the mysql import message stronger 2015-08-07 16:15:56 +00:00
Gerben Meijer
7817890b80 Fix parenthesis typo 2015-08-07 17:11:12 +02:00
Gerben Meijer
5467756328 Generalise mapping ifDescr to ifAlias
This allows both per OS enforcing of ifDescr = ifAlias as well as populating
when ifAlias = '' or NULL
2015-08-07 17:07:26 +02:00
Søren Rosiak
1f22a355f7 Merge pull request #1612 from laf/device-overview-fix 2015-08-07 16:48:14 +02:00
Gerben Meijer
2dd8fe0553 Reorder ifalias_null check to prevent var flapping
This needs to run before IF-MIB data update, and needs to check and set
$this_port['ifAlias'] only as to not break the $data_oids loop.
2015-08-07 16:41:33 +02:00
Daniel Preussker
f02acd69a5 Merge pull request #1635 from laf/issue-1618
Added docs for MySQL strict mode + update validate to warn about it
2015-08-07 09:54:11 +00:00
Daniel Preussker
c935759038 Merge pull request #1640 from laf/issue-1637
Initialises $port_count if empty
2015-08-07 09:28:34 +00:00
Daniel Preussker
d553c69236 Merge pull request #1632 from infernix/ifalias-null
Properly reference ifalias_null config flag
2015-08-07 09:27:31 +00:00
Daniel Preussker
d79fae3d3b Merge pull request #1636 from laf/issue-1617
Fix bug with edit/create template re-using template
2015-08-07 09:26:31 +00:00
Daniel Preussker
0dd3a6ef4a Merge pull request #1634 from laf/issue-1619
Added the poller group name to the table - general if no poller groups created
2015-08-07 09:24:33 +00:00
Daniel Preussker
d628094f36 Merge pull request #1639 from laf/windows-fix
Updated Windows build versions + added server type for windows os
2015-08-07 09:16:54 +00:00
laf
3188a86eee Initialises $port_count if empty 2015-08-07 08:24:53 +00:00
laf
023e42a101 Updated Windows build versions + added server type for windows os 2015-08-06 20:00:36 +00:00
laf
26174ed882 Two fixes for mysql strict mode 2015-08-06 19:18:11 +00:00
laf
51e75b3b46 Fix bug with edit/create template re-using template 2015-08-06 19:08:36 +00:00
laf
b1c7b1ee67 Added docs for MySQL strict mode + update validate to warn about it 2015-08-06 19:02:05 +00:00
laf
c6e3be2277 Added the poller group name to the table - general if no poller groups created 2015-08-06 18:36:26 +00:00
Gerben Meijer
5e68b2e6e1 Also update $this_port for port descr parsing 2015-08-06 17:57:53 +02:00
Gerben Meijer
4357f64a2a I agree to the conditions of the Contributor Agreement contained in doc/General/Contributing.md. 2015-08-06 16:56:59 +02:00
Gerben Meijer
f016c84981 Properly reference ifalias_null config flag
Fixes an issue introduced in 9908eb2e37
2015-08-06 16:51:02 +02:00
Daniel Preussker
5b1c2c1d0b Merge pull request #1629 from Rosiak/revert-1610-issues
Fix uptime issues introduced in #1610
2015-08-06 09:45:24 +00:00
Søren Rosiak
9223f8953c Fix uptime issues introduced in #1610
As stated
2015-08-06 10:43:17 +02:00
Daniel Preussker
7cb45421fa Merge pull request #1623 from laf/issue-740
Updated discovery to log new type + updated eventlog page to show this
2015-08-06 05:48:41 +00:00
Daniel Preussker
0169c22785 Merge pull request #1624 from laf/nav-shrink
For smaller windows, the logo will be hidden and Plugins text also
2015-08-06 05:39:09 +00:00
Daniel Preussker
02a36b8c7d Merge pull request #1621 from laf/issue-1512
Added proper indexes to the device_perf table
2015-08-06 05:38:45 +00:00
Paul Gear
c997b45f8c Merge pull request #1614 from laf/issue-1566
PBN devices support CDP but does not output like Cisco so using a dif…
2015-08-06 09:01:42 +10:00
laf
323e247e1b For smaller windows, the logo will be hidden and Plugins text also 2015-08-05 21:00:21 +00:00
laf
746c52046b Updated discovery to log new type + updated eventlog page to show this 2015-08-05 20:05:45 +00:00
laf
34f783fb0b Added proper indexes to the device_perf table 2015-08-05 19:01:03 +00:00
Daniel Preussker
2537767f2d Merge pull request #1615 from adaniels21487/issue-1592
Use graph generation functions instead of static generation
2015-08-04 22:46:29 +00:00
Aaron Daniels
dde56c3b24 Modified code to use graph generation functions instead of generating manually.
The graph generation functions check for the status of 'web_mouseover'.
2015-08-05 07:13:19 +10:00
laf
de0f9ee697 PBN devices support CDP but does not output like Cisco so using a different function to grab the first array needed 2015-08-04 20:37:05 +00:00
Paul Gear
a10c488915 Merge pull request #1611 from SaaldjorMike/remove-php-closing-tags
Remove php closing tags to fix scrut issues
2015-08-05 06:32:12 +10:00
Paul Gear
c14146467e Merge pull request #1610 from SaaldjorMike/scrut-fixes
Fix some scrutinizer coding style issues
2015-08-05 06:31:57 +10:00
laf
3395cf3fd4 Updated include to match standards 2015-08-04 20:17:07 +00:00