Commit Graph

3556 Commits

Author SHA1 Message Date
Tony Murray
dd9e19d9ed Fix slow poller debug (waiting for output)
More robust rrdtool_check_rrd_exists() check
Line return after outputting the rrd command for easier to read debug output
Updated some phpdoc comments in rrdtool.inc.php
2016-07-15 12:21:09 -05:00
Tony Murray
01cfb960d1 Fix sensors rrd name issue
Use last instead of first, as last won't flush rrdcached
Only stream_select if timeout > 0
Attempt to fix mysql
2016-07-08 22:58:36 -05:00
Tony Murray
c5c5469179 Fix rrdtool_check_rrd_exists() 2016-07-08 14:35:00 -05:00
Tony Murray
a1ab19047e Merge remote-tracking branch 'upstream/master' into rrd-create-remote 2016-07-07 21:28:47 -05:00
Tony Murray
57650e4ffc Remove nfs requirement for distributed poller (with rrdtool 1.5+)
Use data_update instead of rrd_update/rrd_create and influx_update
Centralize rrd file check so we can check against a remote rrdcached server too
Use rrd_name() to generate rrd file names
2016-07-07 21:10:06 -05:00
Chris A. Evans
e63f7d6c13 moved slcSystemModelString.0 to features 2016-07-07 15:09:43 -05:00
Chris A. Evans
88d916ff5c fixed model dicovery -- slcSystemModelString.0 does not work on older SW versions 2016-07-07 15:06:39 -05:00
Chris A. Evans
4a70d2e08b * Modified Lantronix SLC modules to snmpget against OID names via MIB rather than OID numbers
* Added Copyright disclaimer to Lantronix SLC modules

 Changes to be committed:
	modified:   includes/discovery/os/lantronix-slc.inc.php
	modified:   includes/discovery/sensors/temperatures/lantronix-slc.inc.php
	modified:   includes/polling/os/lantronix-slc.inc.php
2016-07-07 13:52:18 -05:00
Chris A. Evans
f60bccccc6 created lantronix-os branch 2016-07-07 13:32:32 -05:00
Neil Lathwood
0f5cfb5af1 Merge pull request #3782 from murrant/git-date
Add date to git version info
2016-07-07 19:09:15 +01:00
Neil Lathwood
ca73042add Merge pull request #3787 from thecityofguanyu/thecityofguanyu/add-adtran-os
Thecityofguanyu/add-adtran-os
2016-07-07 16:05:06 +01:00
Chris A. Evans
ff844dce70 fixed os name case 2016-07-07 08:44:54 -05:00
Tony Murray
debe052f56 Re-add missing data 2016-07-06 19:06:54 -05:00
Tony Murray
8362039f67 Support older versions of git 2016-07-06 18:29:41 -05:00
Neil Lathwood
1e42c815c4 Merge pull request #3788 from murrant/fix-device-groups
Fix device group search
2016-07-06 23:14:19 +01:00
Tony Murray
c4c98128d6 Fix device group search 2016-07-06 17:13:13 -05:00
Neil Lathwood
272c640173 Merge pull request #3786 from adaniels21487/feature/os-acs
OS Support for Cisco Access Control System (ACS) virtual appliances
2016-07-06 23:10:04 +01:00
Chris A. Evans
f22cfb4728 fixed typo in adtran os polling module 2016-07-06 16:45:54 -05:00
Chris A. Evans
3b126788e3 fixed mib dir in adtran os polling module 2016-07-06 16:44:30 -05:00
Chris A. Evans
3bf3370eb8 renamed adtran os discovery module 2016-07-06 16:35:32 -05:00
Chris A. Evans
f6b8135ac4 Changes to be committed:
modified:   includes/definitions.inc.php
	renamed:    includes/discovery/os/netvanta.inc.php -> includes/discovery/os/adtran-os.inc.php
	renamed:    includes/discovery/processors/netvanta.inc.php -> includes/discovery/processors/adtran-aos.inc.php
2016-07-06 16:32:39 -05:00
Chris A. Evans
bf617e79c9 Merge remote-tracking branch 'origin/master' into thecityofguanyu/add-adtran-os 2016-07-06 16:27:27 -05:00
Chris A. Evans
790abb1f17 Merge remote-tracking branch 'origin/master' into thecityofguanyu/add-adtran-os 2016-07-06 16:26:27 -05:00
Søren Rosiak
b38cb6b76f Merge pull request #3741 from laf/junos-optics 2016-07-06 23:07:49 +02:00
Neil Lathwood
671288e74d Merge pull request #3648 from geordish/speed-up-port-polling
WIP: Attempt to speed up SNMP port polling
2016-07-06 21:46:27 +01:00
Neil Lathwood
fa366b5109 Merge pull request #3773 from thecityofguanyu/thecityofguanyu/add-telco-systems-os
thecityofguanyu/add telco systems os
2016-07-06 21:45:55 +01:00
Tony Murray
846c5ab0c9 Add date to git version info
valdiate: local tz, rfc2822
poller: iso 8601
about: iso 8601 -> browser local
Also, do not fetch github info on about page, it isn't used.
2016-07-06 13:17:13 -05:00
Brandon Boudrias
11f651fa39 prevent device_by_id_cache from adding unneeded array elements to $device 2016-07-06 10:08:19 -07:00
laf
0ad3bd5710 Updated apple logo for macosx os 2016-07-06 15:25:13 +01:00
Dave Bell
43dc0e6194 Removed duplicate delecration, and improved test for valid data 2016-07-06 09:24:09 +01:00
Chris A. Evans
38e222fd8a removed empty/unsued else conditionals 2016-07-05 12:17:25 -05:00
Dave Bell
baa8191b4b Add ifInDiscards/ifOutDiscards 2016-07-05 16:20:40 +01:00
Chris A. Evans
95ad8f186e fixed typo in: includes/discovery/sensors/temperatures/binos.inc.php
removed all mibs, as they are not actually referenced in modules
2016-07-05 09:59:09 -05:00
Chris A. Evans
875e6f9990 fixed typo in binox temperature sensor discovery module 2016-07-05 09:19:20 -05:00
Chris A. Evans
a012d7e549 added telco systems icon, updated definitions to reference said icon 2016-07-05 09:14:56 -05:00
Chris A. Evans
7850f9e68b updated definitions.inc.php to include telco systems binos and binox os: 2016-07-05 09:13:21 -05:00
Chris A. Evans
9a3cf966fc Merge remote-tracking branch 'origin/master' into thecityofguanyu/add-telco-systems-os 2016-07-05 09:07:10 -05:00
Neil Lathwood
9f2e88fa59 Merge pull request #3772 from tijmenNL/issue-3771
Fixed typo in poller application for PowerDNS
2016-07-05 14:51:42 +01:00
Neil Lathwood
a291ac2cc6 Merge pull request #3767 from thecityofguanyu/thecityofguanyu/add-accedian-os
Add Accedian MetroNID OS Support
2016-07-05 14:50:47 +01:00
walrus
e537f9743a renamed various metronid.inc.php files to aen.inc.php 2016-07-05 07:49:45 -05:00
Tijmen de Mes
c815675bd8 Fixed typo in poller application for PowerDNS 2016-07-05 10:56:44 +02:00
Neil Lathwood
6665fd8f95 Merge pull request #3700 from f0o/issue-3683
Fixed Device-Groups for multiple entries and glue-expansion
2016-07-05 09:09:09 +01:00
walrus
6763ad0790 * Split Telco Systems discovery into BiNOX and BiNOS
* Fix formatting errors

 Changes to be committed:
	renamed:    includes/discovery/mempools/batm.inc.php -> includes/discovery/mempools/binox.inc.php
	renamed:    includes/discovery/os/batm.inc.php -> includes/discovery/os/binos.inc.php
	new file:   includes/discovery/os/binox.inc.php
	deleted:    includes/discovery/processors/batm.inc.php
	new file:   includes/discovery/processors/binos.inc.php
	new file:   includes/discovery/processors/binox.inc.php
	deleted:    includes/discovery/sensors/temperatures/batm.inc.php
	new file:   includes/discovery/sensors/temperatures/binos.inc.php
	new file:   includes/discovery/sensors/temperatures/binox.inc.php
	renamed:    includes/polling/mempools/batm.inc.php -> includes/polling/mempools/binox.inc.php
	new file:   includes/polling/os/binos.inc.php
	renamed:    includes/polling/os/batm.inc.php -> includes/polling/os/binox.inc.php
2016-07-03 17:42:08 -05:00
walrus
ac2f4ff158 updated os name 2016-07-03 17:13:23 -05:00
walrus
d4e8837053 Changes to be committed:
modified:   includes/definitions.inc.php
	modified:   includes/discovery/os/metronid.inc.php
	modified:   includes/discovery/processors/metronid.inc.php
	modified:   includes/discovery/sensors/temperatures/metronid.inc.php
	renamed:    includes/polling/os/accedian.inc.php -> includes/polling/os/aen.inc.php
2016-07-03 16:22:09 -05:00
Neil Lathwood
194c0c4d43 Merge pull request #3768 from thecityofguanyu/thecityofguanyu/add-calix-processor-discovery
Add Calix processor discovery module
2016-07-03 19:54:43 +01:00
laf
ea9e107700 Forcing scrut run 2016-07-03 19:46:10 +01:00
Neil Lathwood
451c228b73 Merge pull request #3721 from mogensen/feature/Adding-APs-To-Cisco-WLC
Feature/adding APs to cisco wlc
2016-07-03 19:44:14 +01:00
Frederik Mogensen
c19080d0f6 Passing a reference to array_pop 2016-07-02 20:49:59 +02:00
walrus
1737190c53 added calix processor discovery module 2016-07-02 12:58:51 -05:00