Commit Graph

4585 Commits

Author SHA1 Message Date
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
artica 53ad5e1cd9 Updated version and build strings. 2021-07-21 10:57:56 +02: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
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
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
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
artica 8a4e51bf1b Auto-updated build strings. 2021-07-03 01:00:31 +02:00
vgilc 159920a05d Merge branch 'ent-7127-alert-server-implementar-la-ejecucion-de-alertas-de-manera-independiente' into 'develop'
Add the AlertServer to the repo.

See merge request artica/pandorafms!4251
2021-07-02 09:15:27 +00:00
artica 1328b2055c Auto-updated build strings. 2021-07-02 01:00:32 +02:00
Ramon Novoa f8bcd1660f Add the AlertServer to the repo.
The new AlertServer allows alerts to be queued and executed outside the
data processing pipeline. Ref. pandora_enterprise#7127.
2021-07-01 16:19:47 +02:00
artica 911d9fe8fe Auto-updated build strings. 2021-07-01 01:00:09 +02:00
artica 7dc2245f2e Auto-updated build strings. 2021-06-30 01:00:32 +02:00
fbsanchez 074fbf916c Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-29 20:03:07 +02:00
Daniel Rodriguez 35e889be15 Merge branch 'ent-4759-compatibilidad-ssl-y-certificados-conexiones-mysql' into 'develop'
Add SSL support for database connections.

See merge request artica/pandorafms!4134
2021-06-29 14:50:25 +00:00
fbsanchez c64b972564 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-29 10:51:55 +02:00
artica 7f58a93bfd Auto-updated build strings. 2021-06-29 01:00:15 +02:00
fbsanchez 753bb7ff03 Avoid apply a non-synced policy 2021-06-28 12:44:24 +02:00
fbsanchez 771c51ef5d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-28 10:13:51 +02:00
artica 6fc94f3fad Auto-updated build strings. 2021-06-28 01:00:29 +02:00
artica 69c1a5fdad Auto-updated build strings. 2021-06-27 01:00:26 +02:00
artica b7d956041d Auto-updated build strings. 2021-06-26 01:01:41 +02:00
fbsanchez c0d56f8563 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-25 09:48:52 +02:00
artica 4438dad309 Auto-updated build strings. 2021-06-25 01:00:39 +02:00
fbsanchez 4c2ac234b8 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
Conflicts:
	pandora_console/extras/mr/48.sql
	pandora_console/godmode/servers/plugin.php
2021-06-24 14:37:30 +02:00
artica 86abd75206 Auto-updated build strings. 2021-06-24 01:00:51 +02:00
fbsanchez 2fe6092d37 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-23 20:08:59 +02:00