tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
29,793 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

6283 Commits

Author SHA1 Message Date
Calvo 37dacfa499 g,k kjjMerge remote-tracking branch 'origin/develop' into ent-7799-jerarquia-fiels-alertas-snmp-accion-comando-de-alerta 2021-11-18 09:37:31 +01:00
artica a5cfe3869c Auto-updated build strings. 2021-11-18 01:00:18 +01:00
artica 7a290bfac6 Auto-updated build strings. 2021-11-17 01:00:19 +01:00
Daniel Rodriguez a940396b0d Merge branch 'ent-7379-macro-de-direcciones-en-network-y-pluginserver' into 'develop' 
Rename the _address_n_ macro and add it to more servers.

Closes pandora_enterprise#7379

See merge request artica/pandorafms!4462
 2021-11-16 12:07:54 +00:00
artica 7b717bcc6d Auto-updated build strings. 2021-11-16 01:00:20 +01:00
artica 203aa3ef8a Auto-updated build strings. 2021-11-15 01:00:15 +01:00
artica bb771ec140 Auto-updated build strings. 2021-11-14 01:00:16 +01:00
artica 94fadddc80 Auto-updated build strings. 2021-11-13 01:00:19 +01:00
artica bfa8dc4473 Auto-updated build strings. 2021-11-12 01:00:07 +01:00
artica bf0be017b6 Updated version and build strings. 2021-11-11 19:06:08 +01:00
Ramon Novoa 55532ab0ab Merge commit '6081384ef968a53b3c9cec84b984d378b85afde6' into master-alt 2021-11-11 18:42:27 +01:00
artica b5cc63c159 Auto-updated build strings. 2021-11-11 01:00:19 +01:00
artica 3069c89e6e Auto-updated build strings. 2021-11-10 01:00:15 +01:00
artica 707bee66c1 Auto-updated build strings. 2021-11-09 01:01:01 +01:00
fbsanchez ac890ee165 some tools for policy-auto-application 2021-11-08 14:00:26 +01:00
Daniel Barbero Martin 900a37ad5d Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales 2021-11-08 08:54:41 +01:00
Junichi Satoh 9c2aae2a44 Fixed special multibyte characters treatment. 
They were not converted to html entities when storing to DB.
 2021-11-08 10:00:43 +09:00
artica df48e7f73d Auto-updated build strings. 2021-11-08 01:00:17 +01:00
artica b2db6064bf Auto-updated build strings. 2021-11-07 01:00:17 +01:00
artica 3e9bc55e68 Auto-updated build strings. 2021-11-06 01:00:21 +01:00
Daniel Barbero Martin c3e2b4361f Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales 2021-11-05 10:00:15 +01:00
artica 9c290d917e Auto-updated build strings. 2021-11-05 01:00:12 +01:00
José González bdc4d0a8b1 Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 
This reverts merge request !4302
 2021-11-04 16:28:15 +01:00
Jose Gonzalez c0abe5edb9 Fix merge 2021-11-04 16:00:05 +01:00
Daniel Barbero Martin c3f4addb0e wip special days alerts 2021-11-04 12:33:40 +01:00
artica 4ebb817d90 Auto-updated build strings. 2021-11-04 01:00:54 +01:00
artica 0be9abcdca Auto-updated build strings. 2021-11-03 01:00:21 +01:00
artica 23566c9ef4 Auto-updated build strings. 2021-11-02 01:00:18 +01:00
artica f1734e56c3 Auto-updated build strings. 2021-11-01 01:00:17 +01:00
artica 7b9234f392 Auto-updated build strings. 2021-10-31 01:00:19 +02:00
artica 6c6c375702 Auto-updated build strings. 2021-10-30 01:00:24 +02:00
Daniel Rodriguez 3883c99804 Merge branch 'ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card' into 'develop' 
CorrelationServer

See merge request artica/pandorafms!4377
 2021-10-29 10:07:25 +00:00
artica c903942c7b Auto-updated build strings. 2021-10-29 01:00:21 +02:00
fbsanchez bf0064d486 Correlated alerts are not being linked to modules 2021-10-28 17:21:02 +02:00
fbsanchez 701c384c54 More accurated message when recovering event alerts 2021-10-28 13:01:18 +02:00
artica 7cd429d9f8 Auto-updated build strings. 2021-10-28 01:00:22 +02:00
fbsanchez 2d09e5bfb7 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card 2021-10-27 22:59:19 +02:00
Daniel Rodriguez 0ec2bf30ce Merge branch 'ent-7972-funcionalidad-historico-de-alertas-lanzadas' into 'develop' 
Fix SQL errors in action queries.

See merge request artica/pandorafms!4502
 2021-10-27 15:45:33 +00:00
artica 945392b615 Auto-updated build strings. 2021-10-27 01:00:56 +02:00
Ramon Novoa cd3e20fefe Fix action information for SNMP alert events. 2021-10-26 17:40:03 +02:00
Ramon Novoa 35aa6b5258 Fix SQL errors in action queries. 2021-10-26 15:07:42 +02:00
fbsanchez a5bf72cca0 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/include/constants.php
	pandora_server/lib/PandoraFMS/Tools.pm
 2021-10-26 14:21:40 +02:00
Ramon Novoa 356e1f9f2b Fix SQL errors in action queries. 2021-10-26 13:24:23 +02:00
Daniel Rodriguez e2ae42dd89 Merge branch 'ent-7060-gestion-basica-de-configuracion-de-equipos-de-red' into 'develop' 
NCM

See merge request artica/pandorafms!4434
 2021-10-26 08:21:01 +00:00
artica 24404d5078 Auto-updated build strings. 2021-10-26 01:01:06 +02:00
fbsanchez 5ae3bbc4fe Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 2021-10-25 10:28:31 +02:00
artica 56ca01112d Auto-updated build strings. 2021-10-25 01:00:48 +02:00
artica ef41522899 Auto-updated build strings. 2021-10-24 01:00:45 +02:00
artica 134f6ea2a5 Auto-updated build strings. 2021-10-23 01:00:54 +02:00
artica 1218932b05 Auto-updated build strings. 2021-10-22 01:00:20 +02:00
fbsanchez bb8dbc9332 NCM 2021-10-21 02:17:17 +02:00
artica 80c7f106ad Auto-updated build strings. 2021-10-21 01:00:55 +02:00
artica 6ccf3a9ee9 Updated version and build strings. 2021-10-20 15:31:02 +02:00
Daniel Maya bbbbbdd2bc #8114 remove history_data 2021-10-20 14:50:47 +02:00
Daniel Maya 829ca31e88 #8114 Fixed history_data 2021-10-20 10:52:40 +02:00
artica b70ca89af2 Auto-updated build strings. 2021-10-20 01:01:06 +02:00
artica 65b0d839f9 Auto-updated build strings. 2021-10-19 01:00:50 +02:00
Daniel Rodriguez 704403fd52 Merge branch 'ent-7972-funcionalidad-historico-de-alertas-lanzadas' into 'develop' 
Ent 7972 funcionalidad historico de alertas lanzadas

See merge request artica/pandorafms!4465
 2021-10-18 11:36:19 +00:00
artica c043c3d023 Auto-updated build strings. 2021-10-18 01:00:18 +02:00
artica 6da17b11aa Auto-updated build strings. 2021-10-17 01:00:18 +02:00
artica 0e9f37a090 Auto-updated build strings. 2021-10-16 01:00:22 +02:00
fbsanchez 6c0e2d23de updates 2021-10-15 13:39:23 +02:00
artica af9711ec3d Auto-updated build strings. 2021-10-15 01:00:20 +02:00
Ramon Novoa 118b0c3ff0 Alias the action name when executing an alert. 
When executing an alert, the name of the action retrieved by the Pandora
FMS Server was overwritten by the name of the command, since the names
of the columns are the same. Now the name of the action is aliased to
preserve it.
 2021-10-14 11:02:48 +02:00
artica 20448faa35 Auto-updated build strings. 2021-10-14 01:00:21 +02:00
fbsanchez 96250dcfa0 WIP NCM 2021-10-13 22:47:31 +02:00
artica 9d813b729e Auto-updated build strings. 2021-10-13 01:00:13 +02:00
artica 4fd071cf60 Auto-updated build strings. 2021-10-12 01:00:19 +02:00
fbsanchez d2f5a04583 WIP NCM 2021-10-11 20:42:43 +02:00
Ramon Novoa 1344dee2c4 Add action information to alert events. 2021-10-11 10:43:41 +02:00
artica a8937abb65 Auto-updated build strings. 2021-10-11 01:00:15 +02:00
artica 2b419b826d Auto-updated build strings. 2021-10-10 01:00:16 +02:00
artica 9867024d2e Auto-updated build strings. 2021-10-09 01:00:19 +02:00
Jose Gonzalez 0414b9991a Merge branch 'develop' of brutus.artica.es:artica/pandorafms into ent-7972-funcionalidad-historico-de-alertas-lanzadas 2021-10-08 14:03:25 +02:00
Ramon Novoa 5d7cb5e4c7 Rename the _address_n_ macro and add it to more servers. 
The _address_n_ macro did not work properly because of the partial match
with the _address_ macro. It has been renamed to_addressn_n_ (e.g.,
_addressn_1_, _addressn_2_, etc.) and added to the Network and Plug-in
servers. Fixes pandora_enterprise#7379.
 2021-10-08 13:17:04 +02:00
Jose Gonzalez 4331438765 Removed some cheerful words in the project 2021-10-08 11:13:28 +02:00
artica eb5b34b99e Auto-updated build strings. 2021-10-08 01:00:19 +02:00
artica c7face04e1 Auto-updated build strings. 2021-10-07 01:00:20 +02:00
Jose Gonzalez a70d48514e Fix Barivion name in license and readme 2021-10-06 13:33:25 +02:00
artica 1ebc2ed082 Auto-updated build strings. 2021-10-06 01:00:22 +02:00
Daniel Rodriguez 0dd98b21f3 Merge branch 'ent-8050-arreglar-comprobacion-de-api-en-el-inicio-del-servidor' into 'develop' 
timeout for server API conn test at start

See merge request artica/pandorafms!4437
 2021-10-05 11:07:26 +00:00
Daniel Rodriguez cc36fdc54f Merge branch 'ent-fix-webserver' into 'develop' 
Fixed warnings and problem with multibyte characters on WebServer.

See merge request artica/pandorafms!4357
 2021-10-05 09:51:58 +00:00
artica d1b9dc4ef8 Auto-updated build strings. 2021-10-05 01:00:20 +02:00
artica 0e02cb314c Auto-updated build strings. 2021-10-04 01:00:16 +02:00
artica 7b369d4fed Auto-updated build strings. 2021-10-03 01:00:15 +02:00
artica fd51190b07 Auto-updated build strings. 2021-10-02 01:00:19 +02:00
Daniel Rodriguez 1cdef62ceb Merge branch 'ent-5693-9848-actualizar-campos-personalizados-agente-mediante-cli' into 'develop' 
add agent_update_custom_fields on cli

See merge request artica/pandorafms!4281
 2021-10-01 12:36:17 +00:00
fbsanchez 626a9d17c6 timeout for server API conn test at start 2021-10-01 12:35:26 +02:00
artica 1d74155723 Auto-updated build strings. 2021-10-01 01:00:22 +02:00
marcos d0f08be953 update agent custom fields 2021-09-30 14:34:58 +02:00
marcos d54af52baf update agent custom fields 2021-09-30 12:50:59 +02:00
fbsanchez e237d7dd07 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card 
Conflicts:
	pandora_console/extras/mr/50.sql
 2021-09-30 12:24:19 +02:00
artica 036da5ea3a Auto-updated build strings. 2021-09-30 01:00:18 +02:00
Daniel Rodriguez ee8ae5cf76 Merge branch 'ent-8004-command-center-las-politicas-una-vez-aplicadas-no-se-marcan-en-verde-en-la-metaconsola' into 'develop' 
Avoid MC process data in dataserver

See merge request artica/pandorafms!4427
 2021-09-29 13:27:28 +00:00
Daniel Rodriguez f756cec3be Merge branch 'ent-7869-solucion-automatica-splitbrain-pandora-ha' into 'develop' 
PandoraHA Splitbrain autorecovery

See merge request artica/pandorafms!4413
 2021-09-29 09:58:29 +00:00
artica 06c42a051d Auto-updated build strings. 2021-09-29 01:00:20 +02:00
marcos 4e25442813 update agent custom fields 2021-09-28 11:20:26 +02:00
marcos a8a5289652 update agent custom fields 2021-09-28 09:31:06 +02:00
artica 201fea9378 Auto-updated build strings. 2021-09-28 01:00:21 +02:00
marcos a7e97f0493 refactor update agent custom fields 2021-09-27 17:56:41 +02:00
marcos 87eb16ef32 Merge remote-tracking branch 'origin/master' into ent-5693-9848-actualizar-campos-personalizados-agente-mediante-cli 2021-09-27 17:08:03 +02:00
Daniel Rodriguez 83703b88fa Merge branch 'ent-5171-mejora-logs-discovery' into 'develop' 
Discovery logs improvement

See merge request artica/pandorafms!4422
 2021-09-27 14:37:09 +00:00
fbsanchez 4f76a44ffa Several fixes for correlation recovery 2021-09-27 15:12:20 +02:00
fbsanchez 1983403327 Some improvements 2021-09-27 14:50:34 +02:00
fbsanchez b7879f8815 CorrelationServer with iterative evaluation 2021-09-27 12:25:43 +02:00
fbsanchez f7ec31cc72 Avoid MC process data in dataserver 2021-09-27 10:07:23 +02:00
artica b09febeee0 Auto-updated build strings. 2021-09-27 01:00:15 +02:00
artica 17ba73ad36 Auto-updated build strings. 2021-09-26 01:00:11 +02:00
artica 2cbe307a6f Auto-updated build strings. 2021-09-25 01:00:21 +02:00
artica bc516889bf Auto-updated build strings. 2021-09-24 01:00:21 +02:00
Daniel Rodriguez 7a2c992c44 Merge branch 'ent-7952-comportamiento-extrano-procesamiento-dataserver' into 'develop' 
Do not search the agent name in tagente.direccion.

See merge request artica/pandorafms!4387
 2021-09-23 14:51:48 +00:00
fbsanchez 12ddb4d792 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/pandoradb.sql
 2021-09-23 16:23:38 +02:00
Daniel Rodriguez f60c41ff30 Merge branch 'ent-8011-replicacion-de-eventos-genera-conexiones-infinitas' into 'develop' 
Read event_replication from the database.

See merge request artica/pandorafms!4419
 2021-09-23 10:32:54 +00:00
artica 0e34c1275a Auto-updated build strings. 2021-09-23 01:00:21 +02:00
Daniel Rodriguez 1aabb11c8c Merge branch 'ent-8032-giss-cambiar-comando-de-alerta-para-que-descarte-cualquier-string-que-no-parezca-una-direccion' into 'develop' 
Add simple email address validation.

See merge request artica/pandorafms!4417
 2021-09-22 12:33:18 +00:00
fbsanchez f8ea92923a minor fixes 2021-09-22 11:44:32 +02:00
artica 61e2a3f21b Auto-updated build strings. 2021-09-22 01:00:21 +02:00
fbsanchez 5b8a391f99 Extra options pandora_ha auto-resync 2021-09-21 18:51:50 +02:00
Daniel Rodriguez 125f63a7a2 Merge branch 'ent-7695-eventos-con-entities-al-cambiar-info-de-eventos' into 'develop' 
Fixed entities on text for custom events

See merge request artica/pandorafms!4235
 2021-09-21 13:16:17 +00:00
fbsanchez e9c5d89fdc Added level to log_message (pandora_ha) 2021-09-21 12:48:57 +02:00
fbsanchez b3114262c5 Discovery logs improvement 2021-09-21 12:15:34 +02:00
artica d50cf7431b Auto-updated build strings. 2021-09-21 01:00:17 +02:00
Ramon Novoa 15761e7b02 Read event_replication from the database. 
Instead of reading event_replication from pandora_server.conf, read it
from the database. Ref. pandora_enterprise#8011.
 2021-09-20 13:25:02 +02:00
Ramon Novoa 4a9cac6ef4 Add simple email address validation. 
Add simple email address validation for internal email alerts. Prevents
connections to the SMTP server when no address is provided. Ref.
pandora_enterprise#8032.
 2021-09-20 11:42:27 +02:00
artica 6153237481 Auto-updated build strings. 2021-09-20 01:00:17 +02:00
artica 43c22e9ec7 Auto-updated build strings. 2021-09-19 01:00:12 +02:00
artica 8d2d7f16de Auto-updated build strings. 2021-09-18 01:00:19 +02:00
artica 33788c9238 Auto-updated build strings. 2021-09-17 01:00:18 +02:00
artica d7452d19e8 Auto-updated build strings. 2021-09-16 01:00:22 +02:00
fbsanchez 2e764afac7 PandoraHA Splitbrain autorecovery 2021-09-15 21:38:10 +02:00
Ramon Novoa 165dea9fe7 Merge remote-tracking branch 'origin/master' into master-alt 2021-09-15 17:21:33 +02:00
artica 4cd17dca40 Auto-updated build strings. 2021-09-15 01:00:20 +02:00
artica cf3c328d18 Auto-updated build strings. 2021-09-14 01:00:17 +02:00
Ramon Novoa 74ae4efa9a Add action information to alert events. 2021-09-13 13:13:46 +02:00
artica c231c82e93 Updated version and build strings. 2021-09-13 12:08:23 +02:00
artica 4ec67b51b7 Auto-updated build strings. 2021-09-13 01:00:16 +02:00
artica 4d2a52fcce Auto-updated build strings. 2021-09-12 01:00:13 +02:00
artica 48ee2d3fcd Auto-updated build strings. 2021-09-11 01:00:20 +02:00
artica 12b7cd0c63 Auto-updated build strings. 2021-09-10 01:00:21 +02:00
artica f2875b5a86 Auto-updated build strings. 2021-09-09 01:00:24 +02:00
fbsanchez 34adf6e9e2 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card 2021-09-08 21:21:45 +02:00
fbsanchez 6f50aed48d Some improvements 2021-09-08 19:48:20 +02:00
artica 7e5dc6a9c4 Auto-updated build strings. 2021-09-08 01:00:19 +02:00
artica ecd818bbb7 Auto-updated build strings. 2021-09-07 01:00:19 +02:00
fbsanchez ce3dce926a use safe_output only when message is going to be used logger 2021-09-06 18:14:58 +02:00
Ramon Novoa 7fbd5ed735 Do not search the agent name in tagente.direccion. 
Ref. pandora_enterprise#7952.
 2021-09-06 13:32:17 +02:00
artica 6bb994f4b7 Auto-updated build strings. 2021-09-06 01:00:37 +02:00
artica 42a999b207 Auto-updated build strings. 2021-09-05 01:00:13 +02:00
artica 22a0709953 Auto-updated build strings. 2021-09-04 01:00:22 +02:00
artica 30c6a78b35 Auto-updated build strings. 2021-09-03 01:00:40 +02:00
fbsanchez d8b12233ed correlation_threads 2021-09-02 12:53:57 +02:00
artica 737943fee2 Auto-updated build strings. 2021-09-02 01:00:55 +02:00
fbsanchez df95cbf960 Minor changes 2021-09-01 21:10:11 +02:00
fbsanchez e075c8339d CorrelationServer rc1 2021-09-01 17:56:14 +02:00
artica 10dd28246c Auto-updated build strings. 2021-09-01 01:00:24 +02:00
artica 966a5df96a Auto-updated build strings. 2021-08-31 01:00:50 +02:00
artica b4c52f92f7 Auto-updated build strings. 2021-08-30 01:00:38 +02:00
artica bffc6c52ce Auto-updated build strings. 2021-08-29 01:00:17 +02:00
artica dd538c48bb Auto-updated build strings. 2021-08-28 01:00:24 +02:00
fbsanchez f0791cbd4f WIP CorrelationServer 2021-08-27 15:07:14 +02:00
artica 72e46df88b Auto-updated build strings. 2021-08-27 01:00:23 +02:00
Daniel Rodriguez 25c6a3eef4 Merge branch 'ent-7805-devolver-informacion-del-pandora-server-al-hacer-un-status' into 'develop' 
Update the description for pandora_ha.

See merge request artica/pandorafms!4371
 2021-08-26 10:12:23 +00:00
Ramon Novoa 7e27731ce2 Change more references to Pandora FMS HA Database tool. 2021-08-26 10:47:52 +02:00
artica a8fcec1f6a Auto-updated build strings. 2021-08-26 01:00:50 +02:00
Ramon Novoa 3056874b52 Update the description for pandora_ha. 
Ref. pandora_enterprise#7805.
 2021-08-25 11:47:50 +02:00
Daniel Rodriguez 452d986ab5 Merge branch 'ent-7878-errata-funcion-get_console_api_url-en-db-pm' into 'develop' 
Ensure latest slash in console url

See merge request artica/pandorafms!4368
 2021-08-25 06:55:31 +00:00
artica f63fa5ab96 Auto-updated build strings. 2021-08-25 01:00:39 +02:00
artica 5163f2831d Auto-updated build strings. 2021-08-24 01:00:38 +02:00
fbsanchez f0c68a0f54 Ensure latest slash in console url 2021-08-23 12:17:03 +02:00
artica e3619915cc Auto-updated build strings. 2021-08-23 01:00:21 +02:00
artica a8ae80f8a6 Auto-updated build strings. 2021-08-22 01:00:15 +02:00
artica 0f34554ba6 Auto-updated build strings. 2021-08-21 01:00:32 +02:00
artica 7e71b6537f Auto-updated build strings. 2021-08-20 01:00:19 +02:00
artica 38c044f2ae Auto-updated build strings. 2021-08-19 01:00:34 +02:00
artica a1942147e4 Auto-updated build strings. 2021-08-18 01:00:49 +02:00
Daniel Rodriguez fe30b9c785 Merge branch 'ent-7445-Fallo-al-almacenar-dato-string-en-tevento-dentro-de-un-evento-Alert-fired' into 'develop' 
implemented capacity to handle string data for event data

See merge request artica/pandorafms!4184
 2021-08-17 12:19:54 +00:00
Junichi Satoh 54830f5eea Added PATH configuration. 2021-08-17 16:18:04 +09:00
Junichi Satoh ba5e78f398 Fixed warnings and problem with multibyte characters on WebServer. 2021-08-17 16:01:35 +09:00
artica 9f65e8deb0 Auto-updated build strings. 2021-08-17 01:00:44 +02:00
artica 18698827a6 Auto-updated build strings. 2021-08-16 01:00:21 +02:00
artica 4e17c0ecf4 Auto-updated build strings. 2021-08-15 01:00:22 +02:00
artica ce2c4afbb5 Auto-updated build strings. 2021-08-14 01:00:24 +02:00
artica 6a471546d5 Auto-updated build strings. 2021-08-13 01:00:30 +02:00
artica 3bb4c2ac09 Auto-updated build strings. 2021-08-12 01:00:45 +02:00
artica 568bdfb5c0 Auto-updated build strings. 2021-08-11 01:00:19 +02:00
Daniel Rodriguez 00ed8233d0 Merge branch 'ent-7755-graficas-adjuntas-tienen-fuentes-muy-pequeñas' into 'develop' 
set default font size on graph modules when is send in mails

See merge request artica/pandorafms!4264
 2021-08-10 12:19:54 +00:00
artica 2951bf2871 Auto-updated build strings. 2021-08-10 01:00:12 +02:00
Alejandro Campos ff93169049 Merge branch 'develop' into 'ent-7445-Fallo-al-almacenar-dato-string-en-tevento-dentro-de-un-evento-Alert-fired' 
# Conflicts:
#   pandora_console/extras/mr/48.sql
 2021-08-09 06:45:46 +00:00
artica 8b36a96867 Auto-updated build strings. 2021-08-09 01:00:08 +02:00
artica 7a36b18fc0 Auto-updated build strings. 2021-08-08 01:00:11 +02:00
artica 9ea746991b Auto-updated build strings. 2021-08-07 01:00:19 +02:00
artica 14688908e2 Auto-updated build strings. 2021-08-06 01:00:21 +02:00
Daniel Rodriguez 0f8a22feb3 Merge branch 'ent-7860-excluir-mfserver-en-chequeo-pandora_ha' into 'develop' 
Excluded MFSERVER from component checks

See merge request artica/pandorafms!4332
 2021-08-05 12:24:32 +00:00
artica 747d39a066 Auto-updated build strings. 2021-08-05 01:00:50 +02:00
artica c4e1243f18 Auto-updated build strings. 2021-08-04 01:00:42 +02:00
artica 69c4139cc1 Auto-updated build strings. 2021-08-03 01:00:44 +02:00
Daniel Rodriguez 5d501f3abf Merge branch 'ent-7866-12249-no-se-muestra-valor-de-macro-snmp_f1' into 'develop' 
SNMP variable bindings, filter before capture, assign correctly macro values

See merge request artica/pandorafms!4337
 2021-08-02 08:46:50 +00:00
Daniel Rodriguez 1db24ef895 Merge branch 'ent-7856-12235-integria-ims-manda-mal-la-accion-de-crear-ticket-integria' into 'develop' 
fixed error with url integria api

See merge request artica/pandorafms!4329
 2021-08-02 07:24:16 +00:00
artica b837adaf00 Auto-updated build strings. 2021-08-02 01:00:34 +02:00
artica 6e66675f7f Auto-updated build strings. 2021-08-01 01:00:36 +02:00
artica 170f0d9045 Auto-updated build strings. 2021-07-31 01:00:44 +02:00
fbsanchez d59b946954 Errata fix 2021-07-30 16:26:26 +02:00
fbsanchez c1e9025eca SNMP variable bindings, filter before capture, assign correctly macro values 2021-07-30 11:51:00 +02:00
artica 5e2c4349b3 Auto-updated build strings. 2021-07-30 01:00:38 +02:00
artica f9b69c289c Auto-updated build strings. 2021-07-29 01:00:43 +02:00
fbsanchez 403b901e8e Excluded MFSERVER from component checks 2021-07-28 15:06:00 +02:00
artica 5aef20ee31 Auto-updated build strings. 2021-07-28 01:00:37 +02:00
marcos 4431538d14 fixed error with url integria api 2021-07-27 15:48:56 +02:00
artica ee4868d433 Auto-updated build strings. 2021-07-27 01:00:18 +02:00
artica 1c6508947a Auto-updated build strings. 2021-07-26 01:00:35 +02:00
artica 29013e7dd6 Auto-updated build strings. 2021-07-25 01:00:36 +02:00
artica 8fa664c0c5 Auto-updated build strings. 2021-07-24 01:00:36 +02:00
artica 5654de748a Auto-updated build strings. 2021-07-23 01:00:43 +02:00
Calvo 72d57bc067 Get command field if it is not defined in alert or action 2021-07-22 11:39:00 +02:00
Calvo 51ca2de1e5 Get command field if it is not defined in alert or action 2021-07-22 11:34:07 +02:00
José González b554515ca3 Fixed issue with inversed intervals 2021-07-22 11:24:22 +02:00
artica 32210ee7a3 Auto-updated build strings. 2021-07-22 01:00:34 +02:00
Daniel Rodriguez 61bc6d9ff2 Merge branch 'ent-7836-error-del-snmpserver-pm-en-el-pandora_server-error' into 'develop' 
Add a default value for snmpconsole_threshold.

See merge request artica/pandorafms!4319
 2021-07-21 17:19:36 +00:00
Ramon Novoa 28c33aca6b Add a default value for snmpconsole_threshold. 
Ref pandora_enterprise#7836.
 2021-07-21 19:07:02 +02:00
Daniel Rodriguez 62be3f5830 Merge branch 'ent-improved-freebsd-support' into 'develop' 
Improved daemon launcher and installer for FreeBSD.

See merge request artica/pandorafms!4306
 2021-07-21 09:00:33 +00:00
artica 53ad5e1cd9 Updated version and build strings. 2021-07-21 10:57:56 +02:00
Junichi Satoh 4784cab29d Fixed a typo. 2021-07-21 09:08:01 +09:00
artica 89ebe2ea2e Auto-updated build strings. 2021-07-21 01:00:44 +02:00
Daniel Rodriguez 9d1fbf3127 Merge branch 'ent-7808-12182-promocion-de-servidor-master' into 'develop' 
Updated component HA rule

See merge request artica/pandorafms!4301
 2021-07-20 13:05:37 +00:00
artica 63a8ff3f53 Auto-updated build strings. 2021-07-20 01:00:43 +02:00
Junichi Satoh b1ce3acd2f Improved daemon launcher and installer for FreeBSD. 2021-07-19 13:47:24 +09:00
artica 9183110028 Auto-updated build strings. 2021-07-19 01:00:37 +02:00
artica ac28fb7b58 Auto-updated build strings. 2021-07-18 01:00:36 +02:00
artica c5b8f647fe Auto-updated build strings. 2021-07-17 01:00:41 +02:00
fbsanchez 8f009db92b Updated component HA rule 2021-07-16 12:03:26 +02:00
fbsanchez 9643e3ade9 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-07-16 10:36:06 +02:00
artica 0508c0fa88 Auto-updated build strings. 2021-07-16 01:00:32 +02:00
artica bf890c0d11 Auto-updated build strings. 2021-07-15 01:00:40 +02:00
fbsanchez 18948ea9c2 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-07-14 10:04:13 +02:00
artica 31b99ecbfb Auto-updated build strings. 2021-07-14 01:00:39 +02:00
fbsanchez 9b31906bdf Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/mr/48.sql
 2021-07-13 10:01:59 +02:00
artica 925c9fce4f Auto-updated build strings. 2021-07-13 01:00:34 +02:00
artica 922fb81a58 Auto-updated build strings. 2021-07-12 01:00:31 +02:00
artica f3ea9fedf9 Auto-updated build strings. 2021-07-11 01:00:30 +02:00
artica faf154e69c Auto-updated build strings. 2021-07-10 01:00:35 +02:00
fbsanchez 554a32b567 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-07-09 14:40:44 +02:00
marcos 4c82ade184 add agent_update_custom_fields on cli 2021-07-09 13:58:01 +02:00
artica d6cd48fdde Auto-updated build strings. 2021-07-09 01:00:35 +02:00
artica 239e149b3c Auto-updated build strings. 2021-07-08 01:00:36 +02:00
artica a06989dc11 Auto-updated build strings. 2021-07-07 01:00:38 +02:00
artica dec62ffca4 Auto-updated build strings. 2021-07-06 01:00:32 +02:00
marcos ea57c58f40 set default font size on graph modules when is send in mails 2021-07-05 11:34:32 +02:00
fbsanchez f52d389327 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/mr/48.sql
 2021-07-05 09:55:14 +02:00
artica 3baae4147a Auto-updated build strings. 2021-07-05 01:00:29 +02:00
artica b6477e5526 Auto-updated build strings. 2021-07-04 01:00:26 +02:00