4308 Commits

Author	SHA1	Message	Date
artica	6d7a9fd648	Auto-updated build strings.	2017-09-29 00:01:25 +02:00
Ramon Novoa	96a3dfab43	Set @Parser::Expat::Encoding_Path instead of calling load_encoding. ... Parser::Expat::load_encoding doesn't seem to be thread safe. Set @Parser::Expat::Encoding_Path instead to avoid problems. Ref pandora_enterprise#1340.	2017-09-28 15:18:21 +02:00
artica	165087d670	Auto-updated build strings.	2017-09-28 00:01:20 +02:00
daniel	9a66aa52f2	add send mail plain/text	2017-09-27 13:42:02 +02:00
artica	5ab5e04630	Auto-updated build strings.	2017-09-26 00:01:25 +02:00
vgilc	07b8e178d3	Merge branch '152-handle-incomplete-SNMPtraps' into 'develop' ... Improved SNMP trap handling against incomplete traps or partially delayed ones. Closes #152 See merge request !593	2017-09-25 13:14:35 +02:00
artica	444101dbdf	Auto-updated build strings.	2017-09-25 00:01:22 +02:00
artica	3e3268971f	Auto-updated build strings.	2017-09-24 00:01:21 +02:00
artica	d1c4ce1008	Auto-updated build strings.	2017-09-23 00:01:17 +02:00
artica	c50c7b70da	Auto-updated build strings.	2017-09-22 00:01:16 +02:00
artica	581b6cbae2	Auto-updated build strings.	2017-09-21 00:01:28 +02:00
artica	2e802e1b70	Auto-updated build strings.	2017-09-19 00:01:21 +02:00
artica	9a6a22718e	Auto-updated build strings.	2017-09-18 00:01:20 +02:00
artica	14cea700ad	Auto-updated build strings.	2017-09-17 00:01:19 +02:00
artica	d35a88e439	Auto-updated build strings.	2017-09-16 00:01:20 +02:00
artica	802a782c9a	Auto-updated build strings.	2017-09-15 00:01:21 +02:00
artica	41956caa5c	Auto-updated build strings.	2017-09-14 00:01:20 +02:00
vgilc	754697f51c	Merge branch 'ent-966-os_version-en-ficheros-xml-ext-4098-v7-0' into 'develop' ... Ent 966 os version en ficheros xml ext 4098 v7 0 See merge request !813	2017-09-13 12:53:43 +02:00
artica	4cc2a5da0a	Auto-updated build strings.	2017-09-13 00:01:21 +02:00
artica	870a59ba57	Auto-updated build strings.	2017-09-12 00:01:21 +02:00
fermin831	787fb00d16	Avoid to overwrite the os_version when is empty	2017-09-11 17:46:56 +02:00
artica	291871fae0	Auto-updated build strings.	2017-09-11 00:01:20 +02:00
artica	e651f64c85	Auto-updated build strings.	2017-09-10 00:01:18 +02:00
artica	cc36e2756f	Auto-updated build strings.	2017-09-09 00:01:22 +02:00
daniel	8a7b0a0f79	fixed errors in new macro graph treshold	2017-09-08 13:55:03 +02:00
artica	7f3539ecf0	Auto-updated build strings.	2017-09-08 00:01:19 +02:00
artica	80027e4d8c	Auto-updated build strings.	2017-09-07 00:01:31 +02:00
fbsanchez	60424e5be2	Added missed use in Tools.pm	2017-09-06 18:50:03 +02:00
artica	c4a709acf1	Updated version and build strings.	2017-09-06 17:22:32 +02:00
fbsanchez	40dcf343d6	Added to_number to Tools.pm	2017-09-06 12:28:13 +02:00
artica	ce4d898deb	Auto-updated build strings.	2017-09-06 00:01:18 +02:00
Daniel Maya	b6c44db3cd	Merge branch 'develop' into '125-Gestión-recolección-y-correlación-de-logs-dev' ... # Conflicts: # pandora_server/lib/PandoraFMS/Config.pm	2017-09-05 10:00:24 +02:00
artica	924518e02b	Auto-updated build strings.	2017-09-05 00:01:21 +02:00
fbsanchez	ae8ef93191	Logstash/Elasticsearch self monitoring	2017-09-04 20:07:14 +02:00
daniel	a04e02570f	Merge branch 'develop' into 1056-pandora-wux-grid-server	2017-09-04 14:09:08 +02:00
artica	9169cff0b5	Auto-updated build strings.	2017-09-04 00:01:13 +02:00
artica	b35ffc84ba	Auto-updated build strings.	2017-09-03 00:01:13 +02:00
artica	f2cf38a3dd	Auto-updated build strings.	2017-09-02 00:01:14 +02:00
daniel	d74a3f74b4	Merge branch 'develop' into 1056-pandora-wux-grid-server	2017-09-01 10:51:54 +02:00
artica	cce7f496b6	Auto-updated build strings.	2017-09-01 00:01:14 +02:00
fbsanchez	e08a3dd040	Core: Send _data_ macro as image when needed	2017-08-31 16:28:18 +02:00
artica	e45face2fc	Auto-updated build strings.	2017-08-31 00:01:15 +02:00
slerena	10a145fe98	Merge branch '1248-deadlocks-en-pandora-4452' into 'develop' ... Remove nested queries to prevent deadlocks with the Data Server. See merge request !760	2017-08-30 17:48:53 +02:00
artica	0594a7bcbc	Auto-updated build strings.	2017-08-30 00:01:13 +02:00
Ramon Novoa	29cecf2e29	Remove nested queries to prevent deadlocks with the Data Server. ... Ref pandora_enterprise#1248.	2017-08-29 14:34:14 +02:00
artica	8616015f38	Auto-updated build strings.	2017-08-29 00:01:14 +02:00
artica	ab48fabc0b	Auto-updated build strings.	2017-08-28 00:01:12 +02:00
artica	ed72e8c342	Auto-updated build strings.	2017-08-27 00:01:12 +02:00
artica	b907a65921	Auto-updated build strings.	2017-08-26 00:01:37 +02:00
fbsanchez	1d7589dd47	Advanced log management pandora_sever conf tokens	2017-08-25 17:03:26 +02:00