Commit Graph
9941 Commits
Author SHA1 Message Date
Neil Lathwood df0e34f2a0 Merge pull request #2982 from djvdorp/master
Add functions needed to Installation instructions and Support/FAQ
2016-02-11 20:54:15 +00:00
Daniel van Dorp 616820d938 Add functions needed to Support/FAQ 'Why do I not see any graphs?' 2016-02-11 16:51:49 +01:00
Daniel van Dorp 6b26795500 Add functions needed to Installation instructions for Debian Ubuntu and RHEL CentOS 2016-02-11 16:47:02 +01:00
Neil Lathwood 9cca64de4c Merge pull request #2961 from pblasquez/pblasquez-application_json_patch
Missed one file for application/json headers
2016-02-10 21:27:52 +00:00
pblasquez c53e4de20c Update ajax_setresolution.php 2016-02-10 13:22:22 -08:00
Neil Lathwood fa783dc07e Merge pull request #2841 from adaniels21487/issue-2665
Cisco OTV
2016-02-10 19:49:59 +00:00
Daniel Preussker 860dad81cb Merge pull request #2978 from librenms/revert-2976-sanity
Revert "Variable/Environment sanity"
2016-02-10 14:31:25 +00:00
Daniel Preussker 2b55c06d9e Revert "Variable/Environment sanity" 2016-02-10 14:31:16 +00:00
Neil Lathwood 25657881e7 Merge pull request #2976 from f0o/sanity
Variable/Environment sanity
2016-02-10 14:24:23 +00:00
f0o 8d9b522bdb Remove redundant calls 2016-02-10 13:54:22 +00:00
f0o a6bca987bf Enforce sanity before returning from database 2016-02-10 13:52:43 +00:00
f0o 37dccb3932 First effort in bringing some sanity 2016-02-10 13:42:55 +00:00
Neil Lathwood da9f6e5343 Merge pull request #2962 from arrmo/master
Updates for Windows 10
2016-02-09 23:21:40 +00:00
Neil Lathwood e95de786ff Merge pull request #2973 from murrant/issue-2883-2
Missed this while fixing sensor data with 0 values.
2016-02-09 21:45:17 +00:00
Tony Murray 8849cee3f4 Missed this while fixing sensor data with 0 values. 2016-02-09 15:42:46 -06:00
Neil Lathwood 29f3dac9be Merge pull request #2972 from murrant/issue-2883
Deal with 0 value for sensor data better.
2016-02-09 21:11:26 +00:00
Tony Murray e3ec42c06d Deal with 0 value for sensor data better.
Issue #2883
2016-02-09 14:20:36 -06:00
Neil Lathwood 3704ff2c67 Merge pull request #2964 from ohrensessel/correct-quotes
Fix usage of single quotes, double quotes needed
2016-02-09 20:10:51 +00:00
Neil Lathwood fabcd84de7 Merge pull request #2959 from murrant/netonix
Add hardware and version for Netonix.
2016-02-09 20:07:42 +00:00
Neil Lathwood 758facd4bf Merge pull request #2958 from murrant/calix
Calix Support
2016-02-09 20:06:27 +00:00
Tony Murray f45bceecba The fanspeed is frequently 0 rpm. 2016-02-09 13:36:44 -06:00
Tony Murray 0422d8e589 Add fanspeed,temp, and voltage for Netonix switches. 2016-02-09 13:31:36 -06:00
Neil Lathwood 5f0c150d42 Merge pull request #2946 from murrant/oxidized_group_versions
Fix oxidized versioning + groups
2016-02-09 19:25:22 +00:00
Daniel Preussker e7a99cc81f Merge pull request #2971 from laf/continue-fix
Changed continue to break
2016-02-09 19:13:56 +00:00
laf 6e71661a3a Changed continue to break 2016-02-09 19:04:05 +00:00
Neil Lathwood fe3d1c7c1a Merge pull request #2970 from librenms/revert-2969-revert-2935-pblasquez-location_map_regex
Revert "Revert "Added location_map_regex""
2016-02-09 19:03:01 +00:00
Neil Lathwood f074f25be2 Revert "Revert "Added location_map_regex"" 2016-02-09 19:02:38 +00:00
Daniel Preussker 4cc523aeb0 Merge pull request #2969 from librenms/revert-2935-pblasquez-location_map_regex
Revert "Added location_map_regex"
2016-02-09 19:01:03 +00:00
Daniel Preussker 1110836662 Revert "Added location_map_regex" 2016-02-09 20:00:54 +01:00
Neil Lathwood 3b19af910b Merge pull request #2935 from pblasquez/pblasquez-location_map_regex
Added location_map_regex
2016-02-09 18:56:55 +00:00
Tony Murray 1b59ae9648 Use $config['mibdir'] instead of $config['mib_dir'] 2016-02-09 08:01:41 -06:00
ohrensessel b016763007 Fix usage of single quotes, double quotes needed 2016-02-09 13:27:10 +01:00
arrmo f2054d369b Updates for Windows 10 2016-02-08 20:15:11 -06:00
pblasquez 2a98a2825f Update ajax_setresolution.php 2016-02-08 16:29:53 -08:00
pblasquez 1b97bf069f Update rewrites.php 2016-02-08 16:09:16 -08:00
pblasquez 3ee30fae7c Update Configuration.md 2016-02-08 16:03:48 -08:00
Tony Murray 21c2bb312a Do not hardcode mib path 2016-02-08 15:50:54 -06:00
Tony Murray fc82587c3f Merge branch 'master' into netonix 2016-02-08 15:24:47 -06:00
Tony Murray 17fe1d1f66 I could not find cpu info in Calix MIBs. Just load in hr. 2016-02-08 15:01:25 -06:00
Tony Murray f177dd6608 Merge branch 'master' into calix 2016-02-08 14:20:14 -06:00
Tony Murray 1d796fecfe Add a generic way to allow empty ifDescr on ports for an OS. 2016-02-08 13:58:03 -06:00
Tony Murray 799bb4dc5d Pull card serial numbers. Unsure if this what we want.
Set ifName as the primary port name.
2016-02-08 10:29:55 -06:00
Daniel Preussker f170a1ab77 Merge pull request #2950 from librenms/f0o-changelog-20160207
Updated changelog
201602
2016-02-07 15:59:02 +00:00
Daniel Preussker 9c0cc8ad0c Updated#2 2016-02-07 15:47:14 +00:00
Daniel Preussker 5d73a2a6e4 Merge pull request #2951 from librenms/f0o-hotfix
Fix IP Display
2016-02-07 15:46:32 +00:00
Daniel Preussker b0bc7b778a Typo 2016-02-07 15:40:00 +00:00
Daniel Preussker f940c0c888 Fix IP Display 2016-02-07 15:39:17 +00:00
Daniel Preussker ff91e97b16 Updated changelog 2016-02-07 15:26:16 +00:00
f0o 4d0d78c48c Merge branch 'issue-386-v3' of git://github.com/BarbarossaTM/librenms
Conflicts:
	sql-schema/099.sql
2016-02-07 15:23:52 +00:00
Daniel Preussker 0dc9219e56 Merge pull request #2949 from gottaloveit/master
add Dell Networking sysObjectId
2016-02-07 14:34:10 +00:00