Commit Graph

33452 Commits

Author SHA1 Message Date
daniel bac1a7bf65 fixed styles 2023-03-23 17:44:06 +01:00
Pablo Aragon 122f45fcaa Metasetup 2023-03-23 17:44:04 +01:00
daniel 56e4770b93 fixed styles 2023-03-23 14:20:54 +01:00
Rafael Ameijeiras 766664470d Merge branch 'ent-9893-nuevo-sistema-de-ha' into 'develop'
Ent 9893 nuevo sistema de ha

See merge request artica/pandorafms!5563
2023-03-23 12:58:53 +00:00
Daniel Rodriguez b09d65dd91 Merge branch 'ent-10010-mejorar-filtrado-logs-en-informe-de-logs' into 'develop'
Ent 10010 mejorar filtrado logs en informe de logs

See merge request artica/pandorafms!5602
2023-03-23 11:46:49 +00:00
daniel 95834b2de7 fixed styles 2023-03-23 12:41:39 +01:00
Daniel Cebrian 2683f9e6dc #10792 fixed error 500 in agent status list 2023-03-23 12:39:55 +01:00
Ramon Novoa 96a9063196 Fix a typo. 2023-03-23 12:27:19 +01:00
Daniel Maya 52231615f6 Merge branch 'develop' into ent-8642-nuevo-widget-heatmap 2023-03-23 11:51:54 +01:00
Pablo Aragon 1ac37dd538 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-23 11:51:32 +01:00
Pablo Aragon f32c886167 10712-login 2023-03-23 11:51:21 +01:00
Ramon Novoa 5b3c5850b0 Set a default value for ha_hosts_file in pandora_db. 2023-03-23 11:17:00 +01:00
Daniel Maya 94c843dac2 #9662 Fixed gis map menu 2023-03-23 10:41:08 +01:00
Daniel Cebrian a60f9be920 #9624 changed default binary path daemon for sflow 2023-03-23 09:53:34 +01:00
Pablo Aragon e2820d1ad7 9680-Fix widget 2023-03-23 09:18:39 +01:00
daniel 0959f1a537 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-23 07:44:17 +01:00
artica cbbddd1ac6 Auto-updated build strings. 2023-03-23 01:00:18 +01:00
Pablo Aragon 1316968295 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-22 20:00:48 +01:00
Pablo Aragon bd48dba65f 10715-Fix width tree view graph 2023-03-22 20:00:42 +01:00
daniel cf0ef462b9 Merge branch 'ent-9662-second-round' into 'develop'
Ent 9662 second round

See merge request artica/pandorafms!5621
2023-03-22 18:15:58 +00:00
daniel 72c95a6274 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-22 19:12:16 +01:00
Pablo Aragon d6bf16f536 10712-Login 2023-03-22 18:57:36 +01:00
Rafael Ameijeiras 4535fb85a3 Merge branch 'ent-10568-14584-Comentarios-no-mostrados-en-eventos' into 'develop'
fixes in event comments

See merge request artica/pandorafms!5591
2023-03-22 17:05:54 +00:00
Pablo Aragon 8b163cd100 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-22 16:42:15 +01:00
Pablo Aragon b0b2778c4a 10760-Setup 2023-03-22 16:42:03 +01:00
Jonathan c52ca613b2 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-22 14:22:08 +01:00
Jonathan a063c7a0ac Fix header and menu 2023-03-22 14:21:56 +01:00
daniel e82de5d6aa fixed styles 2023-03-22 14:08:03 +01:00
Rafael Ameijeiras 656ee43b86 Merge branch 'ent-10771-definir-que-por-defecto-se-use-el-pandorafsnmp-en-lugar-de-bra-para-v1-y-v2-en-nuevas' into 'develop'
set pandorafsnmp as default binary for snmp v2 and v1 snmpserver

See merge request artica/pandorafms!5620
2023-03-22 12:45:49 +00:00
Rafael Ameijeiras 3fcf4dfbc5 Merge branch 'ent-10737-15246-error-500-en-mapa-servicios-metaconsola' into 'develop'
Ent 10737 15246 error 500 en mapa servicios metaconsola

See merge request artica/pandorafms!5617
2023-03-22 10:34:42 +00:00
Pablo Aragon 41a20a90fa Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-22 11:23:14 +01:00
Pablo Aragon 904b526b30 Change pass login. Graph tree view width 2023-03-22 11:23:07 +01:00
daniel 5eaa4a10bb fixed styles 2023-03-22 11:13:56 +01:00
Rafael Ameijeiras 87421e772d Merge branch 'develop' into 'ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos'
# Conflicts:
#   pandora_console/install.php
2023-03-22 08:23:07 +00:00
artica 6e8eb9800f Auto-updated build strings. 2023-03-22 01:00:23 +01:00
Ramon Novoa 373701e28a Make pandora_db read ha_hosts_file if available. 2023-03-21 19:25:19 +01:00
daniel 362a406b52 Merge branch 'ent-9662-second-round' into 'develop'
Ent 9662 second round

See merge request artica/pandorafms!5615
2023-03-21 17:46:40 +00:00
daniel 64e5ceaea0 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-21 18:43:39 +01:00
daniel 732000f7bd fixed styles 2023-03-21 18:42:31 +01:00
Pablo Aragon 583ec8209c Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-21 18:12:11 +01:00
Pablo Aragon 99b845db3f progress bar 2023-03-21 18:12:02 +01:00
rafael 45e04c005f 10771 fix typo 2023-03-21 17:23:35 +01:00
rafael 1de15ddcd5 10771 adding default value on comments 2023-03-21 17:22:52 +01:00
rafael ca8573ae70 10771 adding default value on comments 2023-03-21 17:21:28 +01:00
rafael c4a3263453 set pandorafsnmp as default binary for snmp v2 and v1 snmpserver 2023-03-21 17:16:31 +01:00
Jonathan e2615b9593 Visual changes header 2023-03-21 17:02:03 +01:00
Daniel Cebrian fe70d7d44b #10650 added image maintenance mode 2023-03-21 16:26:05 +01:00
rafael 840e1c393a 10707 adding arping to ubuntu and xtrabackup 8 to mysql8 installation 2023-03-21 15:41:15 +01:00
Daniel Cebrian a21e43a452 #10764 ignore selected action in fav menu 2023-03-21 15:40:46 +01:00
Jonathan 93f5b62bd2 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-21 14:23:15 +01:00