Commit Graph
130 Commits
Author SHA1 Message Date
cigamit f40b8541e6 Attempt to resolve Issue #1475
The function that is attempting to detect hex is not very reliable.
2018-03-19 06:58:58 -05:00
cigamit 827bf550c9 Resolving Issue #1461
Setting output_format on input type causes no values to be returned
2018-03-14 20:57:27 -05:00
cigamit ecf6ea4f2d Additional Changes for #1380
- Moving the function into the API
- Adding missing i18n of lib/data_query.php
2018-02-23 07:57:25 -06:00
cigamit 3a13f1c7a8 Resolving Issue #1319
FrontEnd + Remote Poller - Connection timeout issue
2018-02-08 06:59:33 -06:00
netniV 27e858e089 issue#1040: Correct sizeof() issues with get_data_query_array() and get_graph_group() results (#1299) 2018-02-03 06:59:20 -07:00
cigamit 0e9baa3432 Dont error out on upgrade from early versions
If you were at 0.8.7g- you would get an upgrade error.
2018-01-14 19:16:31 -06:00
cigamit a646bc194b Fixups for Issues #1168 and #1186
This addresses both visual and functional changes to ensure everything
is working.
2018-01-12 14:30:13 -06:00
netniV e5ae849e2c Issue #1168 - Unable to copy debug information (#1186)
* Fix for Issue #1168 - Allow copy of debug query text to clipboard
Issue #1168 - Allow debug query section to be copied to the clipboard

- Currently, whilst clipboard code is run, no text is being copied
- Various text updated to i18n calls.
- CSS still needs to be generated

* Update with working version of copy that doesn't collapse with table header

* Update copyToClipboard to copy table as HTML not just the HTML text

* Issue #1168 - Further clipboard enhancements
issue #1168 now presents a 'Copy' link on the right side of a debug header table (currently a circle)

This functionality has been extended to copy the entire debug via the "Data Query Debug Information" header
Sections are automatically expanded whilst copying to allow selection copy, non-expansion prevents this

* Further fixes for #1168
issue#1168: Now uses jQuery.dialog() for messages (a lot nicer!)

Need to find out if there is a function to retrieve Cacti language messages, ie, get data from https://cacti/messages.php?text
2018-01-12 17:42:00 -06:00
Tony Roman 519b35f5cd Update copyright to 2018 2018-01-06 09:10:15 -05:00
Browniebraun 114f239245 usage of get_default_contextoption 2017-11-13 15:14:27 +01:00
Patrick 928ae7de82 Various updates (#1075)
* 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

* Fixed warnings in graph_view

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

* Updated Dutch translations
- Fixed conflicts in translations

* Various fixes
- Changed array access identifiers
- Fixed some code layout changes
- Fixed one i18n entry in api_automation.php

* Updated changelog

* Layout changes (tab instead of spaces)

* Layout changes (tab instead of spaces)

* Various fixes
- Changed array access identifiers
- Fixed some code layout changes

* Some fixes for better querying

* Layout change only

* Updated Dutch translations

* Updated changelog

* Updated changelog

* Fixed upgrade script 1_1_28.zip

* Few final fixes after CR or changes

* Updated Dutch translations

* fixed parameter typo in query_debug_timer_stop()

* fixed typo $_SESSION

* MibCache->install() uses MibParser->oids, but MibCache->oids has protected access instead of public

* Updated of PHPMailer to version 5.2.26
- Minor security backport from 6.0 - set Debugoutput in constructor according to SAPI in use, avoiding potential XSS in default debug output. Thanks to Bankde Eakasit for spotting it.

* Remove old autoLoad method
2017-11-12 09:39:55 -06:00
cigamit fbbcedd378 Resolving Issue #1053
- Remote Data Collector issues with https and self signed certificates.
- Some spurious backport of html_escape() calls
2017-11-04 15:36:24 -05:00
Wolfgang Stöggl 4a1a15d72c Correct spelling of RRDtool (#1038)
- Change RRDTool -> RRDtool with a lowercase t.
- Replace in all files except *.mo, *.po, *.pot
2017-10-16 11:32:05 -04: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 63b25083b7 Resolving Issue #935
Support utf8 printable in data query inserts
2017-08-27 15:06:40 -05:00
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