Commit Graph

112 Commits

Author SHA1 Message Date
fermin831 f397b657f1 Added new server_keepalive column to have individual keepalive TICKETS #3273 2016-03-15 16:02:27 +01:00
fermin831 55140d06dd Fixed cron updating problem TICKETS #3329
In addition, linux agent send crontab token and in data modules, cron
information is displayed grayed
2016-02-05 09:56:37 +01:00
fermin831 6ebba6377c Added several alert_templates support TICKET: #3310
and agent reads module_alert_template in conf file
2016-02-01 17:24:31 +01:00
Hirofumi Kosaka 5679fa3f48 Updated DataServer to accept 'alert_template' directive. 2016-01-13 15:25:47 +09:00
Ramon Novoa 86c900b196 Added support for server XML files. 2015-10-14 14:58:34 +02:00
Ramon Novoa 4ae14282ff Sort .data files by filename if modification times are the same.
(cherry picked from commit a87a1f8750)
2015-08-11 12:20:33 +02:00
Ramon Novoa e113c7e850 Sort queued files before applying the one XML per agent limit. 2015-08-10 16:46:10 +02:00
Ramon Novoa 6592e0f5b9 Return from the data server consumer if the XML file was not found. 2015-07-22 10:38:20 +02:00
Ramon Novoa 15fb7ff2e3 Create an event when an agent can't be created because it can't be assigned to a group. 2014-09-16 16:58:37 +02:00
Ramon Novoa 5282d9ef9a Added constants for server types. 2014-09-10 18:05:33 +02:00
jsatoh aabc528c01 2014-08-12 Junichi Satoh <junichi@rworks.jp>
* lib/PandoraFMS/Core.pm, lib/PandoraFMS/DataServer.pm: Fixed sql
	error with MySQL 5.6 and its default sql_mode.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10400 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-12 01:07:29 +00:00
mdtrooper f679cec04c 2014-07-25 Miguel de Dios <miguel.dedios@artica.es>
* lib/PandoraFMS/GIS.pm, lib/PandoraFMS/DB.pm,
	lib/PandoraFMS/Core.pm, lib/PandoraFMS/ReconServer.pm,
	lib/PandoraFMS/DataServer.pm: tiny fixes for to improve the support
	of PostgreSQL.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10356 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-25 13:15:24 +00:00
Ramon Novoa 73494d9f82 2014-05-30 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Config.pm
	  lib/PandoraFMS/DataServer.pm: Ignore the agent group coming from the XML
	  if autocreate_group is set.

	* util/recon_scripts/snmp-recon.pl: Changed the default value for a
	  router-less scan.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10045 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-05-30 10:01:23 +00:00
Ramon Novoa e537124ec8 2014-01-08 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/DataServer.pm: Fixed a typo that prevented timestamps in
	  datalists from being read. Fixes bug #2404.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9297 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-01-08 15:46:44 +00:00
Ramon Novoa 651811b1d9 2013-11-13 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/DataServer.pm: Fixed a bug when a parent was defined but
	  empty in the XML and an agent with an empty address existed in the
	  database.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9071 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-13 12:09:28 +00:00
zarzuelo 3aa5403921 2013-10-28 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/DataServer.pm: Add check to update
	adopted unlinked data modules



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8971 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-28 15:03:00 +00:00
Ramon Novoa 87e009308a 2013-08-01 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/DataServer.pm,
	  lib/PandoraFMS/SNMPServer.pm,
	  lib/PandoraFMS/Server.pm,
	  lib/PandoraFMS/PluginServer.pm,
	  lib/PandoraFMS/ProducerConsumerServer.pm,
	  lib/PandoraFMS/PredictionServer.pm,
	  lib/PandoraFMS/ReconServer.pm,
	  lib/PandoraFMS/NetworkServer.pm,
	  lib/PandoraFMS/WMIServer.pm: Added clean-up code to avoid resource
	  leaks when there is a crash and the server has to auto-restart.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8611 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-01 09:54:21 +00:00
Ramon Novoa 8184f73ae3 2013-05-03 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/DataServer.pm: Add a default module_interval.

	* util/pandora_db.pl: Moved data deletion code to a generic function.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8097 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-05-03 18:00:53 +00:00
Ramon Novoa a99f32ebb6 2013-04-17 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/DataServer.pm: Update the module interval. Fixes bug
	  #3610666.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8007 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-04-17 17:59:49 +00:00
Ramon Novoa 7236978fac 2013-04-17 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/WMIServer.pm: Style fix.

	* lib/PandoraFMS/Core.pm,
	  lib/PandoraFMS/DataServer.pm: Added support for multiple ip
	  addresses.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8001 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-04-17 10:49:47 +00:00
Ramon Novoa 9154814f2c 2013-03-26 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm,
	  lib/PandoraFMS/Tools.pm,
	  lib/PandoraFMS/DataServer.pm,
	  lib/PandoraFMS/ReconServer.pm,
	  bin/pandora_server: Improved pandora_get_os to support custom operating
	  systems and moved it from Tools.pm to Core.pm.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7889 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-03-26 16:13:15 +00:00
zarzuelo 541d99fdd1 2013-03-04 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/Core.pm
	lib/PandoraFMS/DataServer.pm: Clean code and fix some
	forgotten changes in last GIS code



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7774 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-03-04 18:06:46 +00:00
Ramon Novoa caed0f345c 2013-03-01 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm,
	  lib/PandoraFMS/DB.pm,
	  lib/PandoraFMS/DataServer.pm: Refactored some GIS code. Still needs
	  testing.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7768 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-03-01 14:27:52 +00:00
darode 6c61f61ead 2013-02-28 Dario Rodriguez <dario@artica.es>
* lib/PandoraFMS/DataServer.pm: Added feature to update custom
        * field
        on every XML process only with learning mode enabled.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7753 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-02-28 15:38:23 +00:00
zarzuelo 517f8dce89 2013-02-18 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/Core.pm
	lib/PandoraFMS/DataServer.pm: Fixed the exception of "status"
	field of the XML deleted from the supported tags in a previous
	fix for bug 3604850



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7669 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-02-18 11:44:10 +00:00
zarzuelo c242d90a23 2013-02-13 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/Core.pm
	lib/PandoraFMS/DataServer.pm: Fixed a problem with the status
	field of the modules (forced status) in the dataserver creation
	of the module because using create_module_from_hash. 
	Order some code of the same part of the Dataserver



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7644 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-02-13 12:36:08 +00:00
zarzuelo c4af2b67ca 2013-02-07 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/Core.pm
	lib/PandoraFMS/DataServer.pm: Clean code on Dataserver,
	improve error message when ignore GIS data, and change the
	way of update parent info (only in learning mode now)



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7610 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-02-07 17:01:10 +00:00
Ramon Novoa 22c04135e2 2013-01-17 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Config.pm,
	  lib/PandoraFMS/DataServer.pm: Added support for log modules.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7499 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-17 14:38:55 +00:00
darode bdd55253e3 2013-01-09 Dario Rodriguez <dario.rodriguez@artica.es>
* lib/PandoraFMS/DataServer.pm: Fixed a bug which creates modules
        with names which have \n\r and later create problems when editing
        the module information.

	MARGED FROM 4.0.3



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7394 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-09 12:59:11 +00:00
Ramon Novoa 978bfd2033 2012-12-21 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm,
	  lib/PandoraFMS/DataServer.pm,
	  util/pandora_db.pl: Implemented a real not-init status. Small fixes.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7324 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-21 14:42:15 +00:00
zarzuelo f7681e76c1 2012-12-17 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/DataServer.pm: Unset a missed data of the
	parameters hash when create module on dataserver



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7286 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-17 11:05:50 +00:00
Ramon Novoa e45e45cca4 2012-11-28 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Added fired alert count.

	* lib/PandoraFMS/DataServer.pm: Do not process more than one XML from
	  the same agent at the same time.

	* util/pandora_db.pl: Recalculate total module count.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7196 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-28 14:33:26 +00:00
zarzuelo 47f3dd55fa 2012-11-15 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/Core.pm
	lib/PandoraFMS/DataServer.pm: Added support for new agent data in
	the XML as custom_id, url_address and custom fields



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7150 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-15 15:20:48 +00:00
zarzuelo 90cfd8e652 2012-11-13 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/DataServer.pm: Adopt server to the new fields of
	the agents XML



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7144 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-13 12:31:14 +00:00
Ramon Novoa 3324c8a7f9 2012-10-24 Ramon Novoa <rnovoa@artica.es>
* conf/pandora_server.conf,
	  lib/PandoraFMS/Config.pm,
	  lib/PandoraFMS/DataServer.pm: Added a new configuration option to
	  make the data server process XML files in a stack instead of a queue.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7086 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-10-24 09:38:08 +00:00
slerena 1dd53a6733 2012-04-19 Sancho Lerena <slerena@artica.es>
(Merged from 4.0.x Branch)

        * util/pandora_xml_stress.conf: default path for default agentname list.

        * lib/PandoraFMS/DataServer.pm: Units are not overwrite by an empty XML
        parameter.

        * lib/PandoraFMS/ReconServer.pm: Fixed creation of network components
        with double encoding.

        * lib/PandoraFMS/Core.pm: Applied Junichi patch (from trunk) for detecting
        keepalive in some newer SQL systems. Added a lot of safe_output in logfile.
        Added aditional check for INC types on date collision (same date for different
        data). Fixed generation of some events with double encoding.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6052 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-19 18:47:57 +00:00
Ramon Novoa e3878ec855 2012-04-10 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/DataServer.pm: Check for single tag XMLs. Fixes bug #3514207.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5922 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-10 14:21:56 +00:00
slerena 02a3b2882a 2012-03-07 Sancho Lerena <slerena@artica.es>
* lib/PandoraFMS/Core.pm: Updated version.

        * lib/PandoraFMS/DataServer.pm: Support for "UNIT" tag in the
        XML to update module data units from the XML.

        * util/pandora_csvbridge.pl: New tool to create XML data files
        from CSV files containing data.

        * util/pandora_watchdog.sh: Watchdog for Pandora FMS server,
        taken from the documentation and updated.

        *  util/pandora_dbstress.pl, 
        util/pandora_db.pl: Updated version strings.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5713 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-03-07 19:42:28 +00:00
Ramon Novoa 1faca416fd 2012-02-03 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Added support for ff interval. Small
	  improvements.
	
	* lib/PandoraFMS/DataServer.pm: Added "timestamp" to the list of
	  valid XML tags.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5484 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-03 12:31:08 +00:00
Ramon Novoa 4b0e05f527 2011-10-28 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/DataServer.pm: Update the configuration of the
	  module being processed.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5097 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-10-28 11:02:35 +00:00
slerena 66cd5d1481 2011-09-14 Sancho Lerena <slerena@artica.es>
* lib/PandoraFMS/DataServer.pm: Fixed a weird problem resolving GPS
        coordinates with OpenStreet.        




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4950 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-09-14 10:59:53 +00:00
juanmanuelr 2f68a1b9cc 2011-08-26 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* lib/PandoraFMS/DataServer.pm: Added status to supported tags.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4831 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-08-26 11:34:48 +00:00
Ramon Novoa b02695dd95 2011-08-24 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/DataServer.pm: Exclude the datalist tag from the
	  module's extended_info.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4814 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-08-24 11:41:27 +00:00
slerena 1233edd112 2011-08-17 Sancho Lerena <slerena@artica.es>
* SNMPServer.pm: Custom value and custom type are not used anymore.
        All extended info comes into custom_oid which stores now all the
        raw info.

        * Core.pm: pandora_evaluate_snmp_alerts() function now uses complex
        regular expression and new macros to allow complex SNMP trap alerts 
        which takes information from the trap info and puts on the alert.

        * DataServer.pm: Fixed notice about undefined GIS position desc.

        * pandora_db.pl: Version update.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4761 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-08-17 20:11:32 +00:00
Ramon Novoa e60d251f61 2011-08-16 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/DataServer.pm: When reading module tags use
	  get_tag_value to avoid trouble with empty tags.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4737 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-08-16 11:37:17 +00:00
Ramon Novoa 3a8eb06eb9 2011-08-10 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/DataServer.pm: Added support for custom module tags
	  (stored in column extended_info).



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4712 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-08-10 16:58:26 +00:00
zarzuelo afb5bc2db3 2011-06-28 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/DB.pm
	lib/PandoraFMS/Core.pm
	lib/PandoraFMS/DataServer.pm: Improved the token ip
	implantation adding the ip to the secondary agent ips



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4496 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-06-28 15:41:13 +00:00
zarzuelo fd1eec6a3a 2011-06-21 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/DataServer.pm: Fixed numeric condition in a string
	comparation



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4477 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-06-21 15:19:43 +00:00
Ramon Novoa 0035e2937e 2011-06-08 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/DB.pm: Added a function to get the name of an alert
	  template given the alert id.
	
	* lib/PandoraFMS/Core.pm: Added support for module tags.
	
	* lib/PandoraFMS/DataServer.pm: Do not queue more than max_queue_files
	  files (not max_queue_files + 1!).



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4417 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-06-08 11:07:39 +00:00
Ramon Novoa 2171d8f48b 2011-06-02 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/DataServer.pm: Do not include BADXML files when
	  evaluating max_queue_files.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4398 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-06-02 15:28:29 +00:00