tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-23 18:58:47 +02:00
Code Issues Packages Projects Releases Wiki Activity
34,987 Commits 34 Branches 30 Tags
Commit Graph

5792 Commits

Author SHA1 Message Date
Ramon Novoa
f9b090d857 Merge branch 'ent-5620-nuevo-compilador-para-backend' into master-alt 2021-06-24 12:58:44 +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
Daniel Rodriguez
be8318dc9b Merge branch 'ent-7559-11881-limitacion-en-macro-_snmp_fx_' into 'develop' 
Ent 7559 11881 limitacion en macro  snmp fx

See merge request artica/pandorafms!4203
 2021-06-23 15:29:02 +00:00
Daniel Rodriguez
2a48208fc2 Merge branch 'ent-7635-11977-procesamiento-de-traps-multi-hilo' into 'develop' 
Ent 7635 11977 procesamiento de traps multi hilo

See merge request artica/pandorafms!4187
 2021-06-23 15:16:47 +00:00
artica
e99183e1f0 Auto-updated build strings. 2021-06-23 01:00:51 +02:00
artica
17bae49b21 Auto-updated build strings. 2021-06-22 01:00:56 +02:00
fbsanchez
faa9fee273 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_agents/unix/Darwin/dmg/resources/text/conclusion.html
	pandora_agents/unix/Darwin/dmg/resources/text/license.html
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/extras/mr/48.sql
 2021-06-21 17:33:45 +02:00
Daniel Rodriguez
a2eb62150c Merge branch 'ent-7508-Macro-timestamp-en-alertas-unknown-no-funciona' into 'develop' 
fixed bug in unknown alerts

See merge request artica/pandorafms!4179
 2021-06-21 10:15:15 +00:00
Daniel Rodriguez
acfa36b380 Merge branch 'ent-7286-Líneas-en-pandora-server-error-con-check_string' into 'develop' 
Ent 7286 líneas en pandora server error con check string

See merge request artica/pandorafms!4208
 2021-06-21 09:09:52 +00:00
fbsanchez
d22cdf027c Empty variables also translates macros 2021-06-21 10:06:03 +02:00
fbsanchez
6d67a03b78 Merge remote-tracking branch 'origin/develop' into ent-7559-11881-limitacion-en-macro-_snmp_fx_ 2021-06-21 10:03:46 +02:00
artica
447d463518 Auto-updated build strings. 2021-06-21 01:00:36 +02:00
artica
dd5e7e550d Auto-updated build strings. 2021-06-20 01:00:37 +02:00
artica
682a977ef1 Auto-updated build strings. 2021-06-19 01:00:49 +02:00
Daniel Barbero Martin
1e183c2b60 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-18 08:49:57 +02:00
artica
0c1918eb3c Auto-updated build strings. 2021-06-18 01:00:44 +02:00
Ramon Novoa
8d5acc0d74 Improvements to the SNMP Console. 
Add several improvements to the SNMP Console:
- Source-based locking.
- Server-specific 'threshold'.
- Other small improvements.

Ref. pandora_enterprise#7635.
 2021-06-17 18:59:10 +02:00
Daniel Barbero Martin
50c7394e7d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-17 08:23:46 +02:00
artica
e5cbcd070b Auto-updated build strings. 2021-06-17 01:00:42 +02:00
Daniel Barbero Martin
841842da59 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/pandoradb_data.sql
 2021-06-16 08:46:21 +02:00
artica
90905d72f5 Auto-updated build strings. 2021-06-16 01:00:23 +02:00
Daniel Maya
38ad3574f3 scape meta characters 2021-06-15 15:57:13 +02:00
Daniel Rodriguez
9fcde88ebf Merge branch 'ent-7698-revision-pandora-ha-open-caracteristicas-enterprise' into 'develop' 
pandora_ha enterprise components fixed

See merge request artica/pandorafms!4202
 2021-06-15 13:11:21 +00:00
fbsanchez
c009451d62 Fulfill all variables FX from SNMPTRAP alerts 2021-06-15 13:06:23 +02:00
Daniel Barbero Martin
9e6f3f7b46 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-15 10:35:50 +02:00
artica
2f0cebe979 Auto-updated build strings. 2021-06-15 01:00:51 +02:00
fbsanchez
7e5a082e22 pandora_ha enterprise components fixed 2021-06-14 19:29:24 +02:00
fbsanchez
94cd4c96dd Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/include/javascript/pandora_ui.js
 2021-06-14 17:37:01 +02:00
Daniel Rodriguez
42f5727b18 Merge branch 'ent-7510-muchas-conexiones-sobre-la-bbdd-too-many-connections-mysql' into 'develop' 
Avoid die while decoding erroneus json data

See merge request artica/pandorafms!4116
 2021-06-14 11:39:41 +00:00
Daniel Barbero Martin
a7c1c49636 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-14 08:42:31 +02:00
artica
595fabb232 Auto-updated build strings. 2021-06-14 01:00:18 +02:00
artica
e7a204d6d8 Auto-updated build strings. 2021-06-13 01:00:16 +02:00
artica
8272eb4f5b Auto-updated build strings. 2021-06-12 01:00:21 +02:00
fbsanchez
86f2beb587 Agent collection synchronization aysnc some improvements 2021-06-11 13:55:18 +02:00
Daniel Barbero Martin
75b889875e Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-11 08:41:23 +02:00
artica
876e776d29 Auto-updated build strings. 2021-06-11 01:00:09 +02:00
fbsanchez
ae34209f52 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-10 21:45:50 +02:00
fbsanchez
f6f0d35a5f Collections Async synchronization Meta <=> Nodes 2021-06-10 21:36:54 +02:00
artica
ace916bc8e Updated version and build strings. 2021-06-10 17:12:11 +02:00
Daniel Barbero Martin
9e27843b19 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-10 08:51:48 +02:00
artica
5ad364cc4a Auto-updated build strings. 2021-06-10 01:00:20 +02:00
Daniel Barbero Martin
e54fde338d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-09 08:22:04 +02:00
artica
2953870e4f Auto-updated build strings. 2021-06-09 01:00:20 +02:00
alejandro.campos@artica.es
fdc6d2f4c8 implemented capacity to handle string data for event data 2021-06-08 16:09:37 +02:00
Daniel Rodriguez
4fa8e5cf29 Merge branch 'ent-7617-macro-address-no-funciona-en-modulos-de-red' into 'develop' 
Fixed macro address on network server modules

See merge request artica/pandorafms!4170
 2021-06-08 10:53:15 +00:00
Luis
72cb359133 Fixed macro address on network server modules 2021-06-08 10:53:15 +00:00
Daniel Barbero Martin
df2f72cce3 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-08 08:22:16 +02:00
artica
a63a4efb71 Auto-updated build strings. 2021-06-08 01:00:20 +02:00
alejandro.campos@artica.es
eb87406e58 fixed bug in unknown alerts 2021-06-07 15:22:20 +02:00