Commit Graph
115 Commits
Author SHA1 Message Date
cigamit 4fd458069f Use preg_split over explode for issue #865
Plus use an additional trim on the string to prevent out of order
arguments
2017-07-26 21:33:34 -05:00
cigamit afa98439b6 Resolving Issue #865
Escape Data Query arguments to prevent issues with special characters
2017-07-26 21:24:14 -05:00
John Horne 633812f4c5 Ensure the rewrite_index field is handled and checked correctly. 2017-05-19 23:15:04 +01:00
patrick 16e2b7c052 Replaced all if statements and inline if statement with $variable != '' where strlen($variable) was used to determine if a string was empty or not 2017-05-18 01:14:15 +02:00
cigamit 62f6d88c29 Resolving Issue #470
Enhance Cacti's SNMP function and Data Query XML syntax.  Add
<output_format>hex|string|guess</output_format> tag
2017-05-14 07:34:25 -05:00
cigamit d3c29fc3fe Feature: Support input-output data query type 2017-05-13 11:12:36 -05:00
Patrick f76503b790 Bugfix for issue#687
- Replaced mysql_real_escape_string() with db_qstr()
2017-05-13 00:01:13 +02:00
Tony Roman 8a179d7d7f Fix up to move if elseif else blocks to PSR 2017-05-07 19:57:36 -04:00
patrick 1ca2ec43bf Removed unnecessary lines en applied some small optimisation and layout changes 2017-04-28 22:43:02 +02:00
Patrick 336888ebf2 Optimisations for lib/data_query.php 2017-04-28 16:47:04 +02:00
patrick ff520ea4f4 Merge remote-tracking branch 'origin/Optimisations' into Optimisations 2017-04-26 23:24:55 +02:00
cigamit 49e83d7fa1 Resolving Issued #580, #606, #608, #609
- Data collection warnings when using cmd.php
- Replace <path_php_binary> in data input methods
- Spaces adjacent to double quotes are eliminated durate data input
method import
- Horor the column setting in graph tree view mode
2017-04-24 20:40:05 -05:00
patrick 02f145af22 Optimisations for lib/data_query.php 2017-04-22 00:10:02 +02:00
patrick cc1cc7eab2 PHP7.2 changes:
- Replaced deprecated each() for foreach()
- Removed reset() calls used for each() loops
2017-04-15 18:00:13 +02:00
cigamit cf0d4c2b0b Reformatting in search of solution to Issue #454 2017-03-26 12:32:22 -05:00
cigamit 79f59d081c Double to single quote conversion 2017-03-12 11:13:56 -05:00
earendilfr 6b0643c3af Fix the error in merge request #352 :
* the $index_recache string already contains the / separator. I don't need to add in preg_match function
* some errors in the methods to take in count the storage of the modified value
* a cosmetic change that permit to clean the debug value in debug_log_return function after the display
* a change in poller function that fixe an error when your index field in the XML file is a fake index oid
2017-03-07 22:50:06 +01:00
cigamit 135b9906cb Don't reindex device 0 2017-03-06 22:27:17 -06:00
Jimmy Conner 677e491c0b Revert "Add the following hability to the walk method for data_query :" 2017-03-06 22:12:32 -06:00
earendilfr 4ac8002af2 Add the following hability to the walk method for data_query :
* VALUE/TEST:(test):(true):(false)
   Check the value with the "test" field and return "true" field if match, "false" field in other cases

* VALUE/TABLE:(value1):(return1):...:(valueX):(returnX)
  Check the value with the "valueX" field and return the corresponding "returnX" field if it's match
  If no "valueX" field match, it return 'N/A'

* VALUE/HEX2IP:(start_nbr):(end_nbr)
  Replace the IP address in hexadecimal mode in numerical format (very usefull for F5 devices)
  The "start_nbr" and "end_nbr" allow to limit the convertion to a part of the value (usefull when the mib return the IP address and the netmask
2017-02-28 11:45:58 +01:00
Arjan Oosting 0d70acaa84 use the decoded value if found 2017-02-01 19:08:35 +01:00
cigamit f756f7173e Add new hooks for customer data input types
This is required for new WMI plugin.
2017-01-15 09:40:12 -06:00
Tony Roman 35a5988f41 Update source code files copyright to new year 2017-01-01 13:45:29 -05:00
cigamit 28b6aef150 Support Rerun Data Query through Remote Agent 2016-12-31 11:19:02 -06:00
cigamit bb2b9baade Warnings issued when using oid_index_parse 2016-12-26 10:26:57 -06:00
cigamit fed85228c0 minor format change 2016-09-19 06:49:18 -05:00
cigamit 287edd89ef add timer diagnostics 2016-09-11 09:26:39 -05:00
cigamit 1fce4a201d minor typo on last commit 2016-09-11 09:20:20 -05:00
cigamit a1d067f309 resolving bug#s 1970 and 2350 2016-09-11 09:12:15 -05:00
cigamit 4aa2342f72 do not allow re-indexing when a host is down or disabled 2016-09-01 23:18:07 -05:00
cigamit b523f1dea5 remove addslashes, prepared statements, wc3 validation, double to single quote
this is required for preparation of magic_quotes_gpc.
2016-08-28 15:27:48 -05:00
cigamit c44a3a0631 resolving bug#1790 2016-08-26 21:00:23 -05:00
cigamit e3af84c761 resolving issues with OID:REGEX on walk 2016-08-22 08:44:09 -05:00
cigamit 8fcb850809 updates to data query parsing
1) add snmp session and snmp context engine id support for PHP 5.4+
2) add rewrite handing courtesy Boris Lytochkin
3) fix some horribly broken logic
2016-08-17 19:40:51 -05:00
cigamit 37d815666c prevent some sql errors 2016-06-18 15:20:09 -05:00
cigamit eb0a1601c1 i18n on lib directory, double to single quotes 2016-05-30 19:49:54 -05:00
cigamit a6b9d168f1 correcting some fatal error 2016-05-13 09:27:02 -05:00
cigamit 6639cef5cb significant improvement in automation
devices should be created and graph automation rules executed with this
change.  still need to validate tree rule creation.  the scope include
initial device creation, and any network scanning.
2016-02-16 20:44:28 -06:00
Micke2k d188f1631d Change Copyright year 2015 -> 2016 2016-01-29 21:46:02 +04:00
Sjon Hortensius 6b59311307 Use microtime(true) instead of manual explode. Also fixes a few uses of deprecated split-method 2016-01-26 09:55:19 +01:00
cigamit 0afd7a3948 improve re-index performance
improve re-index performance by ~70 percent
some double quotes to single quotes
some conversion to prepared statements
2015-05-25 10:38:50 -05:00
cigamit d26bc03225 update Verbose Query output
adding additional timing and visibility settings for Verbose Queries at
the host level. moving some javascript around in order to group script
data.
2015-05-18 21:11:03 -05:00
cigamit 97dd0375a6 rather large automation commit
large automation commit.  table changes and upgrade process will be
committed separately
2015-05-17 20:17:09 -05:00
cigamit f92ae63273 Fixin' the line indention to match 0.8.8d
Just line indention, no other changes were made
2015-04-06 09:19:31 -05:00
cigamit 1340f5c31d Automation Merge 1 of 2
- Merging automation Phase I which only includes the Autom8 plugin.
Phase II will included an enhanced discovery plugin.
- Also reworked the cacti_log function to specify a level in order to
streamline code
- Converted poller functions to still include Poller[xx], but all others
will not
- More conversion of double to single quotes
2015-04-03 18:27:54 -05: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
Jimmy Conner 5bde3da972 1) Update Copyright Years Correct a few minor CY Issues
2) Allow Locking/UnLocking of Graphs
3) ToolTips
4) Correct Minor Issues with Login/Out/Permission associated with Theme JS
5) Upgrade jQuery which has Fixes for Major issue in Safari 7/8.1

git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7662 860744bd-22fc-0310-8c96-e9fe5004b5ca
2015-01-04 01:52:50 +00:00
Jeff Pasnak fa0e971385 #0002492 - Standardize mysql syntax - start of lib
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7615 860744bd-22fc-0310-8c96-e9fe5004b5ca
2014-12-26 19:32:18 +00:00
Jimmy Conner 7e28035cfe Correct some missed $cnn->qstr references
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7578 860744bd-22fc-0310-8c96-e9fe5004b5ca
2014-12-18 08:56:55 +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