Commit Graph

7395 Commits

Author SHA1 Message Date
Michael Newton
cc0f449fc9 changes needed to run under web server subdirectory 2015-08-07 11:10:43 -07: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
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
laf
02f0ffe573 Fixed some front page issues 2015-08-04 19:34:52 +00:00
Mike Rostermund
0cc3e1a9e2 Remove php closing tags to fix scrut issues 2015-08-04 19:29:43 +02:00
Mike Rostermund
5369112d48 Fix some scrutinizer coding style issues 2015-08-04 18:36:03 +02:00
Daniel Preussker
e7d87d6b0a Merge pull request #1607 from Rosiak/perle-support
Perle Media Converter Detection
2015-08-04 12:34:13 +00:00
Søren Rosiak
86827f559e Perle Media Converter Detection
- Basic support for Perle Media Converters, tested on a SMI-10G-STS
chassis
- MIB is available from
http://download.perle.com/Media%20Converters/v1.8/mcr_mgt/snmp/perle-mcr-mgt.MIB
has been converted with dos2unix
- Perle has given me permission to use their logo
2015-08-04 10:58:09 +02:00
Daniel Preussker
5f5006b673 Merge pull request #1605 from syzdek/ds/device_groups-sort-order
Ds/device groups sort order
2015-08-04 06:32:19 +00:00
Paul Gear
6f147049de Merge pull request #1601 from f0o/daily-fix
Fix and reformat daily.{sh,php}
2015-08-04 09:26:58 +10:00
Paul Gear
cb49c592e4 Merge pull request #1604 from syzdek/ds/poller-sort-order
Ds/poller sort order
2015-08-04 09:24:44 +10:00
David M. Syzdek
b5db25c436 Adding ORDER BY so device groups are sorted by name instead of creation.
Currently the function for retrieving device_groups returns rows in the order
in which they were created.  This causes the WebUI to display is a semi-random
order.  This patch causes the devices to be sorted by name which makes the
group lists easier to navigate.
2015-08-03 15:18:21 -08:00
David M. Syzdek
853d4a9dd8 Sorting pollers by name on the pollers/tab=pollers page. 2015-08-03 14:55:05 -08:00
David M. Syzdek
23286480c5 Adding David M. Syzdek <david@syzdek.net> (github: syzdek) as an author.
I agree to the conditions of the Contributor Agreement
contained in doc/General/Contributing.md.
2015-08-03 14:10:30 -08:00
Daniel Preussker
d4a47c3083 Merge pull request #1600 from Rosiak/pcoweb_state
PCOWEB improvement
2015-08-03 18:20:40 +00:00
Daniel Preussker
2f4e9fb9c5 Merge pull request #1599 from laf/billing-api
Updated billing features within API + docs
2015-08-03 17:42:58 +00:00