Commit Graph
126 Commits
Author SHA1 Message Date
Mark Brugnoli-Vinten 2b61c1bba3 Further fix for Issue 1723 (#1728)
* Issue #1723 - die() messages should include \n for better logging

This corrects issue #1723 where die() messages appear in log files without a new line character causing logs to appear corrupted.

* Replace \n with PHP_EOF to be platform independant.
2018-07-21 15:17:14 -04:00
Mark Brugnoli-Vinten da8b5169b7 Feature #1588: Check that PHP can run a test file (#1722)
* Feature #1588: Check that PHP can run a test file

* Feature #1628 - Allow the User to define a initial Network Discovery during Setup

* Fix QA issue with PHP 5.4

* Replace \n with PHP_EOL

* Minor changes to tabs vs. space and PHP_EOL

Will have to update packages based upon this too.

* Another minor pull where PHP_EOL was removed
2018-07-21 12:12:25 -04:00
cigamit e64f3582a0 Audit of PHP Data Collection Scripts
- Double to Single Quotes
- Prepared Statements
- "\n" to PHP_EOL
2018-04-07 10:42:07 -05:00
cigamit 7737c01115 Audit of PHP Collection Scripts
- Double to single quotes
- Prepared Statements
- "\n" to PHP_EOL
2018-04-07 10:41:09 -05:00
Matthew Horan 4063a44219 Support FreeBSD 11 ping error for IPv6 hosts (#1470)
FreeBSD 11 returns "No address associated with name" when ping is passed a hostname with only an AAAA record. Adding this to the list of error messages will force fallback to ping6.
2018-03-12 21:29:12 -05:00
netniV d323b05e6b Fix for Issue #1274: Host CPU errors (#1277)
- Issue #1274: Host CPU script checks value prescence to prevent unnecessary errors
2018-01-28 07:05:40 -07:00
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
cigamit 52a9e1fe8c Resolving Issue #1058
ICMP Ping to and IPv6 address fails to gather data for Ping Latency /
CentOS 7.4
2017-11-04 15:42:34 -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 4ce5f6a69a Resolving Issue #915
Non-numeric data in ss_host_disk.php
2017-08-19 08:32:15 -05:00
Tony Roman 0671c788e6 Removed un-needed php closing tag 2017-08-12 23:56:08 -04:00
cigamit cb92d404e6 Revert "Resolve Issue #824"
This reverts commit a087b49910.
2017-06-29 17:38:50 -05:00
cigamit a087b49910 Resolve Issue #824
ss_host_disk.php not updating disk size properly
2017-06-28 20:19:52 -05:00
cigamit 018063c9c5 Resolving Issue #708
Issues finding lib/snmp.php in ss_host* functions
2017-05-19 22:02:31 -05:00
Alexander a517dd13f6 fix regex for IPv6. fix ping output in CentOS 7 2017-05-11 14:39:04 +04: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
Thomas Berberich d2d5347c5e fix regex to use Domains like www.t-online.de 2017-02-20 21:21:35 +01:00
cigamit bd268601e4 Resolving Issue #284 2017-02-09 20:19:26 -06:00
Browniebraun 6839999bf8 Resolving issue #260
Script ping.pl not Working on FreeBSD and BSD systems
2017-02-02 14:50:24 +01:00
cigamit 9b4e1c542f Resolving Issue #225 2017-01-20 09:11:39 -06:00
cigamit 4184558663 Correct for first poll undefined index and make compatible with either host_id or hostname as input 2016-12-28 15:29:27 -06:00
cigamit 0f36a9dbed debugging errors in collectors 2016-09-10 15:23:12 -05:00
cigamit b0940967c8 updating net-snmp scripts 2016-09-10 12:32:21 -05:00
cigamit 80a7ff49db resolving bug#2255 2016-08-18 21:06:36 -05:00
cigamit 060181aa21 resolving bug#2263 2016-08-18 21:01:44 -05:00
cigamit a92ff11ec6 update ping on Linux to work with ipv6 2016-08-18 15:16:53 -05:00
cigamit 4a0f3ca143 addressing bugs 2568 and 2355 2016-07-19 08:02:06 -05:00
cigamit 7fe3534cde -bug:0002642: ping.pl does not take into account host port numbers 2016-01-20 08:49:51 -06:00
cigamit a352a0e227 clean up scripts
Be consistent on error_reporting() and $no_http_headers.
2015-11-14 11:03:15 -06:00
Linegod e539e37ca9 standardize SQL 2015-05-31 22:57:29 -06:00
cigamit abdc1e3d55 Merging 0.8.8d Updates with GitHub
Changes include:
- Convert some <br> to </li>
- Update ChangeLog per 0.8.8d release
- Fix Max Values on UCD/SNMP Memory Template
- Change Cacti Group Format to Modern Theme
- Fix Locking on Graphs
- Force Image format to PNG for Legacy Graph Image
- Correct form Logic on Settings to Fix Reverse Proxy's
- Shorten Uptime Display on Device Edit
- Force a Locale Setting for i18n on Graphs
- Fix Resizable Columns to resize only the current column
- Add DropIcon selectmenu Widget to modern theme
- Fix Issue where delete data source multi leaves orphan records
- Correct performance bug in Boost engine
- Optimize array_to_sql_or performance
- Correct and issue where pushing out data query objects to host cache
could leave orphan elements
- Add OID_REWRITE_PATTERN Feature on input
- Add VALUE/REGEXP Feature on output
- Optimize strip_quotes function to be more intellegent
- Escape shell arguments on Script Data Input types
- Allow Special Characters for LDAP passwords
- Correct LDAP class defect for anonymous binding
- Bypass php-snmp for now
- Correct rrdcleaner bytes units
- Fix loadavg_multi.pl to respect i18n
- Remove legacy row counters from snmpagent pages
2015-03-23 17:02:45 -05:00
Andreas Braun 73724f4e83 - merge Nectar
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7676 860744bd-22fc-0310-8c96-e9fe5004b5ca
2015-01-08 18:46:14 +00:00
Jimmy Conner ac6d6929cc Remove some unnecessary ending PHP closing tags
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7571 860744bd-22fc-0310-8c96-e9fe5004b5ca
2014-12-17 03:02:03 +00: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
Larry Adams ec11544a32 -bug#0002084: Incorrect normalisation of hrStorageTable values over 2^31
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6879 860744bd-22fc-0310-8c96-e9fe5004b5ca
2011-10-29 02:06:17 +00:00
Reinhard Scheck 8250c913dd remove debugging code
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6222 860744bd-22fc-0310-8c96-e9fe5004b5ca
2011-01-16 14:27:32 +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 9d2a164909 -bug#0001568: Cacti currently gives a lot of warnings of deprecated functions on PHP 5.3
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6200 860744bd-22fc-0310-8c96-e9fe5004b5ca
2011-01-06 21:03:25 +00:00
Reinhard Scheck ce726ce73a correct greping of icmp_[s|r]eq e.g. on F14
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6124 860744bd-22fc-0310-8c96-e9fe5004b5ca
2010-11-18 20:03:09 +00:00
Jeff Pasnak 256a0a584f #0001504 - fix no newline errors
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6102 860744bd-22fc-0310-8c96-e9fe5004b5ca
2010-08-21 15:03:22 +00:00
Larry Adams 92a15bee51 -bug#0001292: Over 8TByte Partition in Windows cant get correct data from snmp
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6015 860744bd-22fc-0310-8c96-e9fe5004b5ca
2010-06-19 16:30:34 +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 969e131295 -bug#0001771: "index count changed" not implemented for query_cpu_partitions.pl
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@5964 860744bd-22fc-0310-8c96-e9fe5004b5ca
2010-05-29 14:35:08 +00:00
Reinhard Scheck a18734f414 -bug#0001771: "index count changed" not implemented for query_unix_partitions.pl
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@5963 860744bd-22fc-0310-8c96-e9fe5004b5ca
2010-05-29 14:31:41 +00:00
Reinhard Scheck 8c695e6c52 Oops, removing test code
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@5961 860744bd-22fc-0310-8c96-e9fe5004b5ca
2010-05-29 13:42:03 +00:00
Reinhard Scheck 557feade0d -bug#0001771: "index count changed" not implemented for query_unix_partitions.pl
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@5960 860744bd-22fc-0310-8c96-e9fe5004b5ca
2010-05-29 11:18:24 +00:00