Commit Graph

1261 Commits

Author SHA1 Message Date
Daniel Maya b508e40a73 Changed simple quote in alerts
Former-commit-id: 48f06d79b9f6e93ba2164d8da6240f28cc4f785c
2019-05-14 11:11:27 +02:00
Tatiana Llorente b6e8578d1d Fixed a minor sintax error - #3611
Former-commit-id: 75ba583e8d060887c80eb32fd648157d2c4428bd
2019-05-13 15:54:06 +02:00
Tatiana Llorente e6fa42ddca Fixed a minor bug in remote config - #3611
Former-commit-id: 02a786832c8b02a7f5962cf9021cb5a2fe525bcc
2019-05-13 15:02:13 +02:00
Tatiana Llorente e9082c5d8a Fixed a minor bug in remote config - #3611
Former-commit-id: 905739bc36ce640de743f4d6cf62031263c698eb
2019-05-13 14:55:15 +02:00
Tatiana Llorente 5f2bd0bc8d Merge remote-tracking branch 'origin/develop' into ent-3611-Vista-Creación-Edición-de-Agente
Conflicts:
	pandora_console/include/styles/pandora.css


Former-commit-id: f04b28c642afe7fe1251ae966b3964c321b34c29
2019-05-13 13:17:17 +02:00
marcos.alconada 23b3d07f37 Merge remote-tracking branch 'origin/develop' into ent-3925-eliminar-custom-response-deprecated 2019-05-09 09:29:27 +02:00
Daniel Rodriguez 247605f308 Merge branch 'ent-3664-Al_aplicar_un_cambio_en_un_agente_se_muestra_que_se_ha_realizado_con_exito_pero_no_actualiza_campos_a_primera_vista' into 'develop'
Eliminated the cache when update agents

See merge request artica/pandorafms!2242
2019-05-08 12:50:40 +02:00
marcos.alconada fff3a783a1 Se restablece archivo modificado
Former-commit-id: 1dca6ef8291dbd98951da31fc765130c9c450316
2019-05-06 18:09:30 +02:00
marcos.alconada e1951c45a4 Se añade al 28
Former-commit-id: 1607d9cbc88fe0e029df46ada20046899558829e
2019-05-06 18:06:59 +02:00
Tatiana Llorente 7da5f518d8 Fixed the form when you try to create an agent without alias - #3611
Former-commit-id: 48bacfeb69e9df8114f2421b5d6b40596a5c263c
2019-05-03 14:00:24 +02:00
Tatiana Llorente b3a4d9edf1 New View Create/Update Agent - #3611
Former-commit-id: fc6de6e82874a71477493eb1e9c93a8a7385e342
2019-05-03 13:24:15 +02:00
Tatiana Llorente 9f3c586b55 Merge remote-tracking branch 'origin/develop' into ent-3611-Vista-Creación-Edición-de-Agente
Former-commit-id: b60c4d8c438d79f20cc9dcdfac856bbaf0a4ada5
2019-05-03 13:11:26 +02:00
Tatiana Llorente 7721c0e605 New View Create/Update Agent - #3611
Former-commit-id: 5bcb4f0d94a05819e82cd636ef1683fbb4047495
2019-05-03 13:07:58 +02:00
Daniel Rodriguez 16f687574e Merge branch 'ent-3847-Bug-en-edicion-de-modulos-locales-posible-condicion-especial' into 'develop'
Fixed bug in unlinked modules

See merge request artica/pandorafms!2347

Former-commit-id: 32bea7e188131ae6115f6c45012dafe648f811cd
2019-05-03 12:41:01 +02:00
manuel e424a2a684 Fixed bug in unlinked modules edition
Former-commit-id: ec9ee4ecbc53a5c617aaf2cee52f7cbbf8f94da8
2019-05-03 12:14:23 +02:00
Tatiana Llorente 274c78f647 Merge remote-tracking branch 'origin/develop' into ent-3611-Vista-Creación-Edición-de-Agente
Conflicts:
	pandora_console/include/styles/pandora.css


Former-commit-id: 8beb92aea96f37340434f4a2e5e8012058d52b0a
2019-04-17 10:49:02 +02:00
Tatiana Llorente ed3155c053 New View Create/Update Agent - #3611
Former-commit-id: e8c3576ca06561f5979c0151670115b697533843
2019-04-17 10:35:32 +02:00
Tatiana Llorente cfff9c065d New View Create/Update Agent - #3611
Former-commit-id: 5a36e41a05341d5afa19917a99f34ac16cfc99e9
2019-04-17 09:27:15 +02:00
Tatiana Llorente fd7cbf14cd Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas
Former-commit-id: 91bbd1dac954b151482546b3a75065ab80f19687
2019-04-10 10:15:15 +02:00
manuel 021fc1dbfd Fixed bug in unlinked modules
Former-commit-id: 08279c7f8605b54ae7ecaba32cc7d3c501b3ad5f
2019-04-09 10:46:37 +02:00
Tatiana Llorente d91631e0e1 New design for the tables - #3707
Former-commit-id: 08bb5008c402afa0d5e75d7f8ade167843a22499
2019-04-05 13:18:38 +02:00
Tatiana Llorente 9fe8dcdda3 Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas
Former-commit-id: db7ea3ebe40521488888cf74b6e6ab6563ab6104
2019-04-02 13:49:51 +02:00
Tatiana Llorente f497d3bd2e Added class to action buttons and moved checkbox to the left side
Former-commit-id: 1d7ba8fa06e734a3e45f7bc1ca2f78d0d8978122
2019-04-02 13:42:30 +02:00
daniel 431c807f61 Merge branch 'develop' into 'ent-3445-Solucionar_problematica_flip_flop'
# Conflicts:
#   pandora_console/extras/mr/27.sql

Former-commit-id: 4fcd03764bf959fb6b126df48e20bc29327105b2
2019-04-02 10:21:04 +02:00
Luis Calvo 343c6a6edf Fix agent name input to allow '-'
Former-commit-id: 8b69d89daa3baeca5126c88c53dbe8323860f95d
2019-04-01 15:18:56 +02:00
Daniel Barbero b2e16848f9 add new ff type
Former-commit-id: b9ff391d6586e5844e78207d44cdf9b80c98ba7e
2019-03-29 14:59:31 +01:00
Daniel Barbero Martin a3865a3181 flip flop keep counters
Former-commit-id: 0d39875c7a78f4be07fdffcf76a686007333c626
2019-03-27 18:16:53 +01:00
Tatiana Llorente 34598f391b Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas
Former-commit-id: 8b576f68f26c1fe2b0d6c1f9029eac599f7a377f
2019-03-27 17:05:50 +01:00
Tatiana Llorente 845cb85c55 New design for tables - #3707
Former-commit-id: 923414d8bf98d6264e6cebc27706118e16710b70
2019-03-27 17:03:55 +01:00
fbsanchez 6fb6963501 Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Former-commit-id: 9df9a4c3a4a50e191af5167129df1352e712171e
2019-03-20 17:40:08 +01:00
Alejandro Campos 5cdf2dffa7 Merge branch 'develop' into 'ent-3706-No-se-incluyen-parametros-de-autenticacion-y-privacidad-en-wizard-interfaces-para-modulos-satelite'
# Conflicts:
#   pandora_console/godmode/agentes/agent_wizard.snmp_interfaces_explorer.php

Former-commit-id: f15c507347700205a081d010a9c6f58c0e2e5720
2019-03-19 14:47:32 +01:00
alejandro-campos 120706248b fix auth parameters not being included in agent config file when creating module through SNMP interface wizard using SNMP version 3
Former-commit-id: 86cfc2f9573ecba48af68ca01c43394cd2c23390
2019-03-19 13:24:06 +01:00
Daniel Rodriguez e0c63e17d7 Merge branch 'ent-3692-No-esta-incluyendo-version-en-wizard-interfaces-para-modulos-satelite' into 'develop'
Add module version line to config module configuration data

See merge request artica/pandorafms!2259

Former-commit-id: 5595b821efd2c15e25458cbe8f5d52ab708c533a
2019-03-13 14:05:08 +01:00
alejandro-campos 1276eb3ecf Add module version line to config module configuration data
Former-commit-id: 1a60f3a75f986f65cc8a4e40daf6311ce0148066
2019-03-13 11:57:37 +01:00
samucarc a8af2f89d1 Fixed data type to remote_snmp_proc in modules IfOperSttus
Former-commit-id: 40a9c5ec26449c13d01f232504c4e9a02b2e366b
2019-03-12 17:59:52 +01:00
Daniel Rodriguez b19161ed3c Merge branch 'ent-2687-Añadir-nuevo-custom-field-de-agente-de-tipo-combo' into 'develop'
Added custom field combo values in agent custom field

See merge request artica/pandorafms!2246

Former-commit-id: 3dbf90c17c8964761a53b062a1b9144196ec3cba
2019-03-08 10:34:44 +01:00
manuel d4f5482e99 Added custom field combo values in agent custom field
Former-commit-id: 55ca33d3de14c868e1eec3f32179b33dc3ff589b
2019-03-07 13:37:36 +01:00
samucarc 9db9d1644c Eliminated the cache when update agents
Former-commit-id: 4e52c0f85ae68a5658c8cd40e72064b48c644934
2019-03-06 11:25:47 +01:00
daniel fadf75a626 fixed minor error lenght str.warning and str.critical 1024 charts
Former-commit-id: c7c32a48731eff5c786bd0710652a31a64364861
2019-03-01 13:36:38 +01:00
fbsanchez d8ee90c285 Merge remote-tracking branch 'origin/develop' into ent-3430-discovery
Former-commit-id: cd7b77b0fe8fa41f03024af752b8793ae877de2b
2019-02-25 14:42:48 +01:00
Daniel Rodriguez 7f01e47e1f Merge branch '3281-Vista-monitor-detail-personalizar-campos-a-mostrar' into 'develop'
ent-3281-Vista-monitor-detail-personalizar-campos-a-mostrar

See merge request artica/pandorafms!2132

Former-commit-id: bebade5b9cd293eb6f062f5b6fb85aaad673a9b8
2019-02-25 13:48:37 +01:00
alejandro-campos be7eadeb2c extend status change functionality in monitor detail view custom fields
Former-commit-id: e48ae88416f50b47aac79ae28b9b4bcd08ebdf73
2019-02-25 11:32:26 +01:00
fbsanchez b1aa0fe2f2 Merge from develop
Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7
2019-02-22 12:30:27 +01:00
Alejandro Fraguas e55915e1e2 Merge branch 'ent-3199-Parsear-espacios-al-final-y-caracteres-especiales-al-introducir-nombre-agente-en-consola' into 'develop'
3199-Parsear-espacios-al-final-y-caracteres-especiales-al-introducir-nombre-agente-en-consola into develop

See merge request artica/pandorafms!2193

Former-commit-id: c6e976b78254e6b5b82dddf206c419737bd99a83
2019-02-22 10:01:43 +01:00
alejandro-campos 45bba4faa8 fix agent name input
Former-commit-id: 51b7566719392d1cc43ca04a9ec91ae007e73feb
2019-02-21 19:00:47 +01:00
Daniel Rodriguez 36410a26d1 Merge branch 'ent-3436-custom-fields-como-macros-en-el-server' into 'develop'
Add support for column macros.

See merge request artica/pandorafms!2182

Former-commit-id: 93dad8f6c54f6e46e5e54dab347a96cffe2fd240
2019-02-21 14:38:21 +01:00
Daniel Rodriguez 1c7c0ebe8f Merge branch '3199-Parsear-espacios-al-final-y-caracteres-especiales-al-introducir-nombre-agente-en-consola' into 'develop'
remove special characters from agent alias string on creation and trim blank…

See merge request artica/pandorafms!2100

Former-commit-id: 2e2268eef1c2a45f8c6bc046e9e21d0101d456c0
2019-02-20 11:02:24 +01:00
Alejandro Fraguas 63c00f00a8 Merge branch '3231-Mensaje_erroneo_al_aplicar_grupos_secundarios' into 'develop'
Eliminated message when secondary groups are added

See merge request artica/pandorafms!2124

Former-commit-id: 8c96030a463fa3b95ee2eabe3ee13c1852f60ffd
2019-02-19 18:09:38 +01:00
alejandro-campos c80a1fc3dd add tooltip to agent alias on creation
Former-commit-id: 8724f37e286080e58d9666fceec2e016fa741138
2019-02-19 16:25:19 +01:00
Ramon Novoa 7bd5851667 Add support for column macros.
Former-commit-id: 8b826854c288754feefdbe270701655c6bbbfac9
2019-02-19 13:04:57 +01:00