56 Commits
Author SHA1 Message Date
TheWitnessandCopilot fb1d7ea006 Put the Scripts Directory in Scope for Quality Checks (#6584)
* Allow form_selectable_cell to more easily port

* Removing exclusion for scripts directory

* More fixes for scripts

* Some issues with ss_host_disk.php that passed locally

* More issues not detected locally

* Issues with typing in cacti_snmp_walk

* Adding base files for non-savy composer users

* One more try on ss_host_disk.php

* Aparantly I have to add the lock file

* More changes to lib/snmp.php after testing

* More changes to lib/snmp.php after testing

* Fix number script from Copilot review

* More Composer reviews

* Update scripts/ss_apache_stats.php

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update scripts/motorola_surfboard_SB6141.py

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update scripts/motorola_surfboard_SB6141.py

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Changing syntax of PHP requirement

* Updating composer

* Attempt to quiet some warnings

* Add Syntax Check

* Wrong file name

* Wrong file name

* Better to report before and after

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2026-01-30 08:04:27 -05:00
TheWitness 27919c50d7 Updating Copyrights to 2026 (#6578) 2026-01-28 16:11:10 -05:00
TheWitness 2c779273f9 Copyright Updates and PHP-CS-Fixer updates 2025-03-09 14:34:19 -04:00
TheWitness afcd847639 Revert "QA: Don't use CRLF. Use LF"
This reverts commit 60d42af89c.
2024-12-11 22:47:42 -05:00
TheWitness 60d42af89c QA: Don't use CRLF. Use LF 2024-12-11 22:42:45 -05:00
TheWitness 22b85e1622 Fix: #5966 - Add snmp retries at the device level
* This covers all the built in scripts.  Several packages will need rebuild
2024-12-06 23:07:32 -05:00
TheWitness 1aa72d24c9 QA: Update Copyright to 2024 2024-02-03 14:18:57 -05:00
TheWitness 729c1a041f QA: Update old ss_host_cpu.php script
This will have a ripple effect I think.
2023-08-20 14:14:09 -04:00
TheWitness 9e2f060fb1 Porting #5282: ss_host_cpu.php does not work on remote poller
Only when hmib is enabled.
2023-04-01 11:42:47 -04:00
Mark Brugnoli-Vinten e4d60297fd Update copyright year for 2023 2023-01-04 13:36:25 +00:00
Mark Brugnoli-Vinten 8b29d12cc9 Define cacti system paths as constants for better code checking (#5120)
This also provides a full run of src-fixer against all files to
ensure all code is now in alignment.

Closes #5120
2023-01-01 01:03:15 +00:00
Jing ChenandJing Chen 4e59efad1f Set default value to these script files (#4590)
Co-authored-by: Jing Chen <jingchen@cn.ibm.com>
2022-03-01 22:10:52 -05:00
TheWitness b4405c1707 Some PSR for ss_fping and add missing copyrights and mark executable 2022-02-13 09:55:08 -05:00
cigamit 03658ea66e More script consistency checks 2019-02-18 22:46:14 -06:00
cigamit 33d99b73ff Update scripts to be more consistent 2019-02-18 07:57:04 -06:00
cigamit 3777f8be08 Two changes related to issue #2357
Issues with data collection
2019-02-01 20:29:21 -06:00
netniV 89f0a06216 Resolving issue #2304 and #2311
This commit corrects a previous unseen issue where the PHP environment at command line level is being populated with environment variables normally only seen when called from a web server.

issue#2304: Installation progress stays at 0%
issue#2311: Unable to update PHP location during installation due to incorrect CLI environment

The new check uses the php_sapi_name() function to verify that we are indeed at 'cli' level.  All other values returned by php_sapi_name are considered non-cli including 'cli-server' which is for client/server scenarios.

Most checks have now been replaced by a single defintion ('CACTI_CLI') to define whether in CLI mode.  If a script is only to be called from CLI it must either defined 'CACTI_CLI_ONLY' or include include/cli_check.php instead of include/global.php.
2019-01-15 13:57:50 +00:00
cigamit 7a9ebd81b7 Remove extra logging 2018-10-10 04:43:45 -05:00
cigamit 127e543d45 Remove spurious tabs 2018-10-10 04:35:28 -05:00
cigamit 20be37a052 Resolve Issue #2033
After reboot cpu indexes lost
2018-10-10 04:28:38 -05:00
Mark Brugnoli-Vinten 1ca32862a9 Resolving issue #1920 (#1922)
* Resolving issue #1920

* Minor QA issue
2018-09-14 20:59:52 -05:00
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 7737c01115 Audit of PHP Collection Scripts
- Double to single quotes
- Prepared Statements
- "\n" to PHP_EOL
2018-04-07 10:41:09 -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
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