11136 Commits

Author SHA1 Message Date
38e222fd8a removed empty/unsued else conditionals 2016-07-05 12:17:25 -05:00
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
875e6f9990 fixed typo in binox temperature sensor discovery module 2016-07-05 09:19:20 -05:00
a012d7e549 added telco systems icon, updated definitions to reference said icon 2016-07-05 09:14:56 -05:00
7850f9e68b updated definitions.inc.php to include telco systems binos and binox os: 2016-07-05 09:13:21 -05:00
9a3cf966fc Merge remote-tracking branch 'origin/master' into thecityofguanyu/add-telco-systems-os 2016-07-05 09:07:10 -05:00
9f2e88fa59 Merge pull request #3772 from tijmenNL/issue-3771
Fixed typo in poller application for PowerDNS
2016-07-05 14:51:42 +01:00
a291ac2cc6 Merge pull request #3767 from thecityofguanyu/thecityofguanyu/add-accedian-os
Add Accedian MetroNID OS Support
2016-07-05 14:50:47 +01:00
e537f9743a renamed various metronid.inc.php files to aen.inc.php 2016-07-05 07:49:45 -05:00
c815675bd8 Fixed typo in poller application for PowerDNS 2016-07-05 10:56:44 +02:00
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
b8635a0c5a Merge pull request #3649 from vitalisator/vitalisator-patch-1
making CN with a , inside working
2016-07-05 09:07:39 +01:00
1be5995a7f * Renamed MIB directories to differentiate between BiNOS and BiNOX MIB files 2016-07-03 17:55:42 -05:00
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
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
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
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
a2d932e430 Merge pull request #3769 from laf/changelog
Updated changelog for June
201607
2016-07-03 18:30:26 +01:00
laf
87d9902cac Updated changelog for June 2016-07-03 18:29:14 +01:00
c19080d0f6 Passing a reference to array_pop 2016-07-02 20:49:59 +02:00
1737190c53 added calix processor discovery module 2016-07-02 12:58:51 -05:00
6236657126 add files to telco-systems branch 2016-07-02 12:54:09 -05:00
14679609f1 Add Accedian MetroNID OS Support
Committer: <thecityofguanyu@outlook.com>

 On branch thecityofguanyu/add-accedian-os
 Changes to be committed:
	new file:   html/images/os/accedian.png
	modified:   includes/definitions.inc.php
	new file:   includes/discovery/os/metronid.inc.php
	new file:   includes/discovery/processors/metronid.inc.php
	new file:   includes/discovery/sensors/temperatures/metronid.inc.php
	new file:   includes/polling/os/accedian.inc.php
	new file:   mibs/ACCEDIAN-SMI.mib
	new file:   mibs/ACD-ALARM-MIB.mib
	new file:   mibs/ACD-CFM-MIB.mib
	new file:   mibs/ACD-DESC-MIB.mib
	new file:   mibs/ACD-DISCOVERY-MIB.mib
	new file:   mibs/ACD-FILTER-MIB.mib
	new file:   mibs/ACD-PAA-MIB.mib
	new file:   mibs/ACD-POLICY-MIB.mib
	new file:   mibs/ACD-PORT-MIB.mib
	new file:   mibs/ACD-REGULATOR-MIB.mib
	new file:   mibs/ACD-SA-MIB.mib
	new file:   mibs/ACD-SFP-MIB.mib
	new file:   mibs/ACD-SHAPER-MIB.mib
	new file:   mibs/ACD-SMAP-MIB.mib
	new file:   mibs/ACD-TID-MIB.mib
2016-07-02 11:45:36 -05:00
f0o
0f161921b9 Fix lookup syntax 2016-07-02 06:44:49 +00:00
b2e193e244 Merge pull request #3762 from Zappatron/fix95th
Fix 95th in graphs
2016-07-02 06:14:59 +00:00
796cc9b18f Merge pull request #3765 from cFire/master
Update common.inc.php to allow custom font color
2016-07-02 06:13:43 +00:00
fa96d60908 Merge pull request #3763 from murrant/fix_git_modified
Validate.php fixes
2016-07-02 00:13:42 +01:00
902da3a219 Update common.inc.php to allow custom font color
Allowing customization of the font color is useful for me as I pull graphs into a dashboard which happens to have a black background. Perhaps this feature can be useful to others.
2016-07-02 00:14:18 +02:00
080c59c387 Correct check for command results. 2016-07-01 16:16:23 -05:00
9ff9e5ae72 Merge pull request #3764 from murrant/murrant-poller-spelling
Spelling correction in poller-wrapper.py
2016-07-01 21:57:15 +01:00
2dbec67088 Run git as the configured user when ./validate.php is run as root
Move the modified files check out of the get_version function
2016-07-01 12:49:44 -05:00
bc7e5ffb46 Merge pull request #3752 from laf/ifSpeed
Added ability to override the ifSpeed values of a port
2016-07-01 12:06:25 -05:00
laf
7f8e587eaa fix js error 2016-07-01 18:01:24 +01:00
laf
3d77d1b77c fix js error 2016-07-01 18:00:07 +01:00
laf
0991fbd67d Updated form update 2016-07-01 17:55:55 +01:00
=
3593bb7ef1 I agree to the conditions of the Contributor Agreement contained in doc/General/Contributing.md. 2016-07-01 16:07:46 +01:00
=
0e359753b2 Add myself to AUTHORS.md 2016-07-01 15:54:49 +01:00
=
c6fa5dbe84 Fixed display of 95th % for generic graphs in bytes 2016-07-01 15:22:02 +01:00
6956ed7870 Merge pull request #3761 from gcoeugnet/master
Remove extra dbInsert from dashborads creation
2016-07-01 10:30:41 +01:00
laf
2bffc5c1b7 updates as per comments from murrant 2016-07-01 10:27:15 +01:00
8264f3dfb5 Remove extra dbInsert from dashborads creation 2016-07-01 11:13:10 +02:00
e980c8467a Merge pull request #3722 from brandune/rollup_graphs_redux
deduping type_where code, adding manual types to graph widgets, updating default descriptions
2016-07-01 09:30:56 +01:00
516af08126 Merge pull request #3608 from laf/issue-3590
Added base support + sensors for IBM AMM
2016-06-30 21:25:28 -05:00
cccb07d2a7 matching default port description types with their names 2016-06-30 17:05:55 -07:00
1aab030f37 giving graph widgets option to manually specify port type 2016-06-30 17:05:55 -07:00
4ad75fb89d create common method for generating type_wheres 2016-06-30 17:05:55 -07:00
4202b7920f adding name to authors and signing contributors agreement
I agree to the conditions of the Contributor Agreement
    contained in doc/General/Contributing.md.
2016-06-30 17:05:55 -07:00
laf
50fa575649 Added $os check + copyright 2016-06-30 21:42:45 +01:00
c6842281c0 Merge pull request #3745 from murrant/sensor_cleanup
Clean up sensors and related tables and add constraints
2016-06-30 21:38:28 +01:00
f07c286c4f Rename sql to 121 2016-06-30 15:29:58 -05:00