Commit Graph
31 Commits
Author SHA1 Message Date
cigamit 5e554e618a Resolving Issue #1143 2017-12-21 19:06:14 -06:00
cigamit 7b75366146 Correct backwards compatibility issues with Pull Request #1110
Total has to be after the end of all other existing indexes
2017-12-03 11:18:00 -06:00
Daniel Schall 7b4d33c880 Add CPU Total to 'SNMP - Get Processor Information' (#1110)
* Add CPU Total to 'SNMP - Get Processor Information'

This change adds a virtual index 'Total' to the SNMP info,
showing the average CPU utilization over all cores.

* Changing CPU Total in 'SNMP - Get Processor Information'

Making the total CPU utilization the first element in the array to avoid shifting when CPUs are added.

* Fix for issue #1111 - Issue with ldap authenication (#1118)

* Update change log for pull request #1111

* Fixes for issues #1084, #1106 and #1116 (#1117)

* Fixes for issues 1106 (Graph filters), 1084 (Tree Branch population), and 1116 (Device Template won't set to none)

* Updated changelog\nfor issues #1084, #1106 and #1116

* Cleanup after pull request #1177

Cleanup includes some misqueues in the pull request as well as some
other miscelaneous changes associated with how we have landed on
formatting.

Chagne include:
* No soft tabs on initial tabbing
* ON clause of JOIN should be capitalized and on separate line
* AND/OR should be capitalized in SQL Queries
* Formatting of db_..() functions calls
* Use of sizeof() instead of isset() for array checks
* i18n of Secpass check return values
* Remove trailing whitespace from lines

- ToDo: Remove more having in place of WHERE clauses

* Fix issue #965 - LDAP search error results (#1112)

* Fix issue #965 - LDAP search erorr results

Corrected the error number returned by "Unable to set referrrals" to the correct number.

Added a new error for finding a users DN but not finding the user from the DN.

* Updated changelog for issue #965

* Fix issue 1106 - Graph Filters: template filter have empty value (#1114)

he filter uses index 0 as "All Graphs and Templates" but then searches graph_local for matches against graph_template_id. However, if index 0 is passed as a variable, it is also used in the search. Now when I looked at my database, the following entry existed:

select * from graph_local where graph_template_id = 0;
+------+-------------------+---------+---------------+---------------------+------------+
| id   | graph_template_id | host_id | snmp_query_id | snmp_query_graph_id | snmp_index |
+------+-------------------+---------+---------------+---------------------+------------+
| 1837 |                 0 |       0 |             0 |                   0 |            |
+------+-------------------+---------+---------------+---------------------+------------+

Therefore, it displays an index, but can't get a name for the template since there is no template with ID 0.

select * from graph_templates where id = 0;
Empty set (0.00 sec)

Added code to check for a zero value and only search the databsae if a value is present.

* Fix issue 1109 - Opening graph links by unlogged user - validation error (#1115)

* Fix issue 1109 - Opening graph links by unlogged user - validation error

Referer variable needs to be checked to ensure that it doesn't already have parameters applied.  If it does, then it needs to use the & rather than ? to join onto the URL.

* Updated changelog for issue #1109

* Fix spelling issue

* Minor updates to pull request 1109.

* Resolving Issue #1104

Different Timestamps in Cacti log when in Developer Debug

* Fix issue #1119 - ss_host_cpu.php pulling back too much data (#1120)

* As per the discussion on #1110 it would appear that ss_host_cpu is pulling back everything from the hrProcessorTable rather than just the processor usage. There appears to be a field named 'hrProcessorFrwID' being defined in the database which is actually the index field not the firmware ID

* Added CHANGELOG for issue #1119

* Fix for issue #1111 - Issue with ldap authenication (#1118)

* Update change log for pull request #1111

* Fixes for issues #1084, #1106 and #1116 (#1117)

* Fixes for issues 1106 (Graph filters), 1084 (Tree Branch population), and 1116 (Device Template won't set to none)

* Updated changelog\nfor issues #1084, #1106 and #1116

* Cleanup after pull request #1177

Cleanup includes some misqueues in the pull request as well as some
other miscelaneous changes associated with how we have landed on
formatting.

Chagne include:
* No soft tabs on initial tabbing
* ON clause of JOIN should be capitalized and on separate line
* AND/OR should be capitalized in SQL Queries
* Formatting of db_..() functions calls
* Use of sizeof() instead of isset() for array checks
* i18n of Secpass check return values
* Remove trailing whitespace from lines

- ToDo: Remove more having in place of WHERE clauses

* Fix issue #965 - LDAP search error results (#1112)

* Fix issue #965 - LDAP search erorr results

Corrected the error number returned by "Unable to set referrrals" to the correct number.

Added a new error for finding a users DN but not finding the user from the DN.

* Updated changelog for issue #965

* Fix issue 1106 - Graph Filters: template filter have empty value (#1114)

he filter uses index 0 as "All Graphs and Templates" but then searches graph_local for matches against graph_template_id. However, if index 0 is passed as a variable, it is also used in the search. Now when I looked at my database, the following entry existed:

select * from graph_local where graph_template_id = 0;
+------+-------------------+---------+---------------+---------------------+------------+
| id   | graph_template_id | host_id | snmp_query_id | snmp_query_graph_id | snmp_index |
+------+-------------------+---------+---------------+---------------------+------------+
| 1837 |                 0 |       0 |             0 |                   0 |            |
+------+-------------------+---------+---------------+---------------------+------------+

Therefore, it displays an index, but can't get a name for the template since there is no template with ID 0.

select * from graph_templates where id = 0;
Empty set (0.00 sec)

Added code to check for a zero value and only search the databsae if a value is present.

* Fix issue 1109 - Opening graph links by unlogged user - validation error (#1115)

* Fix issue 1109 - Opening graph links by unlogged user - validation error

Referer variable needs to be checked to ensure that it doesn't already have parameters applied.  If it does, then it needs to use the & rather than ? to join onto the URL.

* Updated changelog for issue #1109

* Fix spelling issue

* Minor updates to pull request 1109.

* Resolving Issue #1104

Different Timestamps in Cacti log when in Developer Debug

* Fix issue #1119 - ss_host_cpu.php pulling back too much data (#1120)

* As per the discussion on #1110 it would appear that ss_host_cpu is pulling back everything from the hrProcessorTable rather than just the processor usage. There appears to be a field named 'hrProcessorFrwID' being defined in the database which is actually the index field not the firmware ID

* Added CHANGELOG for issue #1119

* Add CPU Total to 'SNMP - Get Processor Information'

This change adds a virtual index 'Total' to the SNMP info,
showing the average CPU utilization over all cores.

* Changing CPU Total in 'SNMP - Get Processor Information'

Making the total CPU utilization the first element in the array to avoid shifting when CPUs are added.

* Update CHANGELOG
2017-12-03 08:59:22 -05:00
netniV 4a98f50491 Fix issue #1119 - ss_host_cpu.php pulling back too much data (#1120)
* As per the discussion on #1110 it would appear that ss_host_cpu is pulling back everything from the hrProcessorTable rather than just the processor usage. There appears to be a field named 'hrProcessorFrwID' being defined in the database which is actually the index field not the firmware ID

* Added CHANGELOG for issue #1119
2017-12-02 12:43:15 -05:00
Patrick c3419aa36e Various fixes && Updated Translations (#1032)
Good catch on the bug fixes too.  Hard to spot.
_______________________________________________________

* Updated Dutch translations
- Fixed i18n

* Defined fields in queries

* Fixed changelog

* Updated Dutch translations

* Various fixes

All committed files:
- true|false to lowercase

add_perms.php:
- displayGroups() was undefined

add_tree.php:
- duplicate case for '--quiet'

repair_templates.php:
- correction function call to diaplay_version()

gettext.php:
- PHP EOF unneeded

* Updated Dutch translations
- Updated Dutch translations with latest cacti.pot file

* Updated Dutch translations
- Fixed conflicts in translations
2017-10-15 07:27:25 -05:00
cigamit 018063c9c5 Resolving Issue #708
Issues finding lib/snmp.php in ss_host* functions
2017-05-19 22:02:31 -05:00
Tony Roman 8a179d7d7f Fix up to move if elseif else blocks to PSR 2017-05-07 19:57:36 -04:00
cigamit 2348c2fede Resolving Issue #365
ss_host_disk,php and ss_host_cpu.php should use return
2017-03-04 14:12:26 -06:00
cigamit b0940967c8 updating net-snmp scripts 2016-09-10 12:32:21 -05:00
cigamit a352a0e227 clean up scripts
Be consistent on error_reporting() and $no_http_headers.
2015-11-14 11:03:15 -06:00
Jimmy Conner 4083d9f792 Remove closing PHP tag. The blank line can cause the data query to return a newline before the data, resulting in no indexes found.
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7543 860744bd-22fc-0310-8c96-e9fe5004b5ca
2014-12-06 06:41:19 +00:00
Reinhard Scheck 5d0c100607 fix newline issue on num_indexes
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6221 860744bd-22fc-0310-8c96-e9fe5004b5ca
2011-01-16 14:26:49 +00:00
Reinhard Scheck 21a5fba027 -bug#0001771: "index count changed" not implemented ...
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@5965 860744bd-22fc-0310-8c96-e9fe5004b5ca
2010-05-29 15:02:06 +00:00
Reinhard Scheck 0ced77aa71 0001374: ss_host_disk.php etc. fail on SNMP V3 (index off by 1)
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@4894 860744bd-22fc-0310-8c96-e9fe5004b5ca
2009-01-31 15:14:56 +00:00
Larry Adams d762a46d4b -bug: Fixup for Host Disk and CPU.
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@4738 860744bd-22fc-0310-8c96-e9fe5004b5ca
2008-09-23 03:24:03 +00:00
Reinhard Scheck 5819879dd7 patch #4424 now for 087 as well
Special care will have to be taken on users of "cacti_snmp_walk". This function now has the additional parameter "max_oids".

git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@4602 860744bd-22fc-0310-8c96-e9fe5004b5ca
2008-06-14 09:46:07 +00:00
Larry Adams 64efe41d43 Add support for snmpV3 context's.
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/main@4152 860744bd-22fc-0310-8c96-e9fe5004b5ca
2007-09-16 01:17:39 +00:00
Larry Adams e47927ec03 -feature: Add SNMPv3 Support to Cacti
-feature: Add a Notes field to the Device that can contain arbitrary information
-feature: Add Availability Methods to Cacti including per Host Ping Methods and Timeouts
-feature: Add Max OID's to te Host Level


git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/branches/BRANCH_0_8_6/cacti@4096 860744bd-22fc-0310-8c96-e9fe5004b5ca
2007-08-28 03:34:54 +00:00
Tony Roman 4fe05b968b Altered config.php, and include/config_* to include/global_*
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/branches/BRANCH_0_8_6/cacti@4007 860744bd-22fc-0310-8c96-e9fe5004b5ca
2007-07-05 04:45:43 +00:00
Larry Adams b11bf9946e additional exploit targets
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/branches/BRANCH_0_8_6/cacti@3850 860744bd-22fc-0310-8c96-e9fe5004b5ca
2007-01-02 17:00:24 +00:00
Larry Adams 7248cc5fd7 -bug: Add snmp retries to cacti's snmp functions
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/branches/BRANCH_0_8_6/cacti@3653 860744bd-22fc-0310-8c96-e9fe5004b5ca
2006-07-15 20:05:21 +00:00
Larry Adams 244c51dee8 change default behavior to NOT show errors.
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/branches/BRANCH_0_8_6/cacti@3570 860744bd-22fc-0310-8c96-e9fe5004b5ca
2006-03-12 20:08:51 +00:00
Larry Adams 270510012b repair damaged ss_host_*.php files
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/branches/BRANCH_0_8_6/cacti@3199 860744bd-22fc-0310-8c96-e9fe5004b5ca
2005-09-16 02:22:38 +00:00
Larry Adams 232a8dbb41 update to support snmpV3 authNoPriv
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/branches/BRANCH_0_8_6/cacti@3113 860744bd-22fc-0310-8c96-e9fe5004b5ca
2005-08-19 02:35:12 +00:00
Larry Adams 672af1a256 add port and timeout to base ss_host_* script server data queries
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/branches/BRANCH_0_8_6/cacti@2722 860744bd-22fc-0310-8c96-e9fe5004b5ca
2005-04-25 10:02:12 +00:00
Ian Berry 20a4eee19e small double include bug
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/trunk/cacti@2071 860744bd-22fc-0310-8c96-e9fe5004b5ca
2004-09-12 18:19:11 +00:00
Ian Berry e1215f9971 fixed problem with the 'index' script query method
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/trunk/cacti@2060 860744bd-22fc-0310-8c96-e9fe5004b5ca
2004-09-04 00:30:32 +00:00
Larry Adams 9dac548801 add snmp v2c option
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/trunk/cacti@2027 860744bd-22fc-0310-8c96-e9fe5004b5ca
2004-08-28 13:39:27 +00:00
Ian Berry 64a4cf4a75 implement $called_by_script_server to determine whether a script was called by the script server or not
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/trunk/cacti@1844 860744bd-22fc-0310-8c96-e9fe5004b5ca
2004-07-25 04:20:46 +00:00
Ian Berry 2937473f77 print output to stdout if being called directly from the command line
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/trunk/cacti@1832 860744bd-22fc-0310-8c96-e9fe5004b5ca
2004-07-23 18:29:15 +00:00
Larry Adams 480e1016e8 ready for production
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/trunk/cacti@1780 860744bd-22fc-0310-8c96-e9fe5004b5ca
2004-07-19 00:45:12 +00:00