6294 Commits

Author SHA1 Message Date
Jose Gonzalez
430457b30a Deleted logstash references 2020-12-15 13:12:00 +01:00
Rafael
c06940c181 add fping as dependencie for pandora server open rpms 2020-12-15 12:57:48 +01:00
Jose Gonzalez
397254e4d8 Added fix 2020-12-15 10:45:37 +01:00
Jose Gonzalez
13d7889cc4 Applied fix 2020-12-15 09:57:09 +01:00
artica
fcb7d36146 Auto-updated build strings. 2020-12-15 01:00:07 +01:00
José González
623b729001 Merge branch 'develop' into 'ent-1175-copyright-actualizados'
# Conflicts:
#   pandora_agents/pc/Win32/pandora_agent.conf
#   pandora_agents/win32/bin/pandora_agent.conf
#   pandora_console/extensions/realtime_graphs.php
#   pandora_console/godmode/snmpconsole/snmp_alert.php
#   pandora_console/include/functions_ui.php
#   pandora_console/install.php
#   pandora_console/operation/agentes/realtime_win.php
2020-12-14 11:10:35 +01:00
Luis Calvo
c4eb3dd088 Added log on deleting tgraph_source data in pandora_db 2020-12-14 10:52:12 +01:00
artica
f2eee8fde8 Auto-updated build strings. 2020-12-14 01:00:14 +01:00
artica
d684d3cfeb Auto-updated build strings. 2020-12-13 01:00:14 +01:00
artica
37478e3b49 Auto-updated build strings. 2020-12-12 01:00:16 +01:00
artica
c613828777 Auto-updated build strings. 2020-12-11 01:00:15 +01:00
artica
463013b06a Auto-updated build strings. 2020-12-10 01:00:06 +01:00
artica
17ea6b85c0 Updated version and build strings. 2020-12-09 16:44:12 +01:00
Daniel Rodriguez
4b51e26086 Merge branch 'ent-4231-crear-plugin-para-google-cloud-y-anadirlo-a-discovery' into 'develop'
discovery.cloud.gcp

See merge request artica/pandorafms!3479
2020-12-09 13:54:25 +01:00
artica
3a530d9a33 Auto-updated build strings. 2020-12-09 01:00:13 +01:00
artica
12dca46e6f Auto-updated build strings. 2020-12-08 01:00:14 +01:00
artica
85c8dfe52f Auto-updated build strings. 2020-12-07 01:00:13 +01:00
artica
f016803dbf Auto-updated build strings. 2020-12-06 01:00:13 +01:00
artica
223f3685b3 Auto-updated build strings. 2020-12-05 01:00:17 +01:00
artica
acce2cc2b0 Auto-updated build strings. 2020-12-04 01:00:18 +01:00
Daniel Rodriguez
a23d807baf Merge branch 'ent-6787-plugin-server-timeout-no-funciona-correctamente' into 'develop'
minor fixes in pluginserver

See merge request artica/pandorafms!3667
2020-12-03 11:05:22 +01:00
artica
fbc14f9d95 Auto-updated build strings. 2020-12-03 01:00:16 +01:00
artica
913dc554eb Auto-updated build strings. 2020-12-02 01:00:17 +01:00
fbsanchez
eb67b387b9 Merge remote-tracking branch 'origin/develop' into ent-4231-crear-plugin-para-google-cloud-y-anadirlo-a-discovery
Conflicts:
	pandora_console/include/class/CredentialStore.class.php
2020-12-01 17:32:02 +01:00
fbsanchez
340c3026c2 Fix capitalization issues in wmi windows env 2020-12-01 12:36:24 +01:00
Daniel Rodriguez
1425b09683 Merge branch 'ent-6532-servicios-en-meta-no-cambian-de-estado-cuando-lo-creas-con-el-prediction-server-bajado' into 'develop'
Orphan service modules + control require argument select from sql

See merge request artica/pandorafms!3571
2020-12-01 12:11:33 +01:00
Daniel Rodriguez
e2bffd30c1 Merge branch 'ent-6692-error-CLI-update-group' into 'develop'
Fixed CLI update_group

See merge request artica/pandorafms!3596
2020-12-01 11:57:07 +01:00
artica
e0266b53ba Auto-updated build strings. 2020-12-01 01:00:46 +01:00
Daniel Rodriguez
b334e817b3 Merge branch 'ent-6747-campos-15-a-20-macro-fields-snmp-no-funcionan' into 'develop'
Fix bug with macro fields

Closes pandora_enterprise#6747

See merge request artica/pandorafms!3628
2020-11-30 14:32:14 +01:00
Daniel Rodriguez
b1d2e7bba0 Merge branch 'ent-5572-9625-añadir-configuración-periodo-de-silencio-trap-storm-protection' into 'develop'
Ent 5572 9625 añadir configuración periodo de silencio trap storm protection

See merge request artica/pandorafms!3580
2020-11-30 14:26:23 +01:00
fbsanchez
0eab0c3a18 Merge remote-tracking branch 'origin/develop' into ent-5145-omnishell-agentes-windows 2020-11-30 10:06:04 +01:00
fbsanchez
3f8123e879 Merge remote-tracking branch 'origin/develop' into ent-6787-plugin-server-timeout-no-funciona-correctamente 2020-11-30 10:05:19 +01:00
artica
863b5f3dc8 Auto-updated build strings. 2020-11-30 01:00:15 +01:00
artica
9041fc31e8 Auto-updated build strings. 2020-11-29 01:00:15 +01:00
artica
66978ba49b Auto-updated build strings. 2020-11-28 01:00:18 +01:00
fbsanchez
f4c17087c5 minor fixes in pluginserver 2020-11-27 13:54:58 +01:00
Jose Gonzalez
649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
artica
935ce27a30 Auto-updated build strings. 2020-11-27 01:00:20 +01:00
fbsanchez
7e61465955 Avoid erase ALL sessions from tsessions_php (pandora_db) 2020-11-26 18:27:11 +01:00
Daniel Rodriguez
7cfa10dcbd Merge branch 'ent-6691-cli-delete-group-doesnt-delete-group-name-blankspaces' into 'develop'
Fixed safe input on cli delete_group

See merge request artica/pandorafms!3597
2020-11-26 11:48:35 +01:00
artica
f98f75345c Auto-updated build strings. 2020-11-26 01:00:19 +01:00
Daniel Rodriguez
b2fb9898f2 Merge branch 'ent-4868-poner-la-version-de-producto-en-pandora_ha-anda' into 'develop'
Export product VERSION from Tools.pm

See merge request artica/pandorafms!3641
2020-11-25 18:40:07 +01:00
artica
b6e142a442 Auto-updated build strings. 2020-11-25 01:00:20 +01:00
fbsanchez
04f4aee7eb Export product VERSION from Tools.pm 2020-11-24 10:51:27 +01:00
artica
1ce0a8cba8 Auto-updated build strings. 2020-11-24 01:00:19 +01:00
fbsanchez
a767b6c133 Fixes in history db settings and improved pandora_db tool 2020-11-23 20:16:11 +01:00
artica
7f8324266d Auto-updated build strings. 2020-11-23 01:00:16 +01:00
artica
b116f5b171 Auto-updated build strings. 2020-11-22 01:00:15 +01:00
artica
87640001dd Auto-updated build strings. 2020-11-21 01:00:20 +01:00
artica
f4c5d2ef6d Auto-updated build strings. 2020-11-20 01:00:18 +01:00