tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
20,339 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

4188 Commits

Author SHA1 Message Date
artica e2471b376c Auto-updated build strings. 
Former-commit-id: 6c89b359049f06338695df7e9cabd3293885df10
 2019-01-21 00:01:23 +01:00
artica 14c5e9d48b Auto-updated build strings. 
Former-commit-id: 1eb9179a088600ca4e68930cf9e903997d8f20c7
 2019-01-20 00:01:23 +01:00
artica 5a75662b99 Auto-updated build strings. 
Former-commit-id: 8eff24974e5b3cfbeb57d408c2d4817fe0cb7156
 2019-01-19 00:01:25 +01:00
samucarc 0c9446fceb Added new functionality in CLI and API to update module counts and alert counts 
Former-commit-id: aca543eb33de0dc231d18a4776676a4700b37120
 2019-01-18 17:24:32 +01:00
fbsanchez c24bea32a8 ip to long utils moved to Tools 
Former-commit-id: 737257575dc1ac69ad9f1a284d7165077d7d6d4e
 2019-01-18 12:55:49 +01:00
artica 979a87762e Auto-updated build strings. 
Former-commit-id: 56c567b92e7aad5a2aabd6551b3aa2f07517fb0b
 2019-01-18 00:01:26 +01:00
fbsanchez d57e6db0c0 Merge branch 'ent-3013-ipam-modo-configuracion-de-vlan' of brutus.artica.lan:artica/pandorafms into ent-3013-ipam-modo-configuracion-de-vlan 
Former-commit-id: e65828cb880c2e11f7e54b61d748bf43d8e0f53b
 2019-01-17 18:42:46 +01:00
fbsanchez 81a6584d1c Discovery modules (IPAM: DHCP) 
Former-commit-id: 1849f6625fbd19dd2d6362d3ea20dc16ac73c29b
 2019-01-17 18:42:38 +01:00
Daniel Rodriguez d0ded14018 Merge branch 'ent-3328-7200-correcciones-consola-vmware' into 'develop' 
Ent 3328 7200 correcciones consola vmware

See merge request artica/pandorafms!2126

Former-commit-id: e050791eefa12e7df5348fb190788be539e56c05
 2019-01-17 16:29:11 +01:00
artica 6bf6fd19d6 Auto-updated build strings. 
Former-commit-id: f9fe79ec45febec900d21f62269f4352cc1a97a2
 2019-01-17 00:01:26 +01:00
artica fe13a117aa Auto-updated build strings. 
Former-commit-id: 04682af4f07a1cb2bae17db88c4a4f4e17ad5600
 2019-01-16 00:01:27 +01:00
fbsanchez 2e8e911ca7 added safe_input to custom_fields - value while storing them in db 
Former-commit-id: e06e141883d87a7247a6426a75c03c7df6045e9b
 2019-01-15 18:22:55 +01:00
fbsanchez a84db4d88f Merge remote-tracking branch 'origin/develop' into ent-3328-7200-correcciones-consola-vmware 
Former-commit-id: b09a410d415480efd4bcf6c387347e2e582febeb
 2019-01-15 18:22:27 +01:00
Daniel Rodriguez 6ba8b9ab9a Merge branch '2299_Añadir_nueva_funcionalidad_en_el_CLI_remove_agent_from_policy' into 'develop' 
2299 añadir nueva funcionalidad en el cli remove agent from policy

See merge request artica/pandorafms!2092

Former-commit-id: d9ef39c8571ab3558e76883e1afc9cbb00225c79
 2019-01-15 14:37:08 +01:00
artica 6894623429 Auto-updated build strings. 
Former-commit-id: 582bbf87e0972212cf48dc220871981f80974321
 2019-01-15 00:01:25 +01:00
Ramon Novoa 33500e635c Add SNMPv3 support to the Enterprise SNMP Server. 
Former-commit-id: 8e0edc671caa7c864fa92c3770fca93bb575958d
 2019-01-14 15:16:36 +01:00
artica ad9a316a47 Auto-updated build strings. 
Former-commit-id: 3426e636c31a7a9dcea09e442811310a4956d6ce
 2019-01-14 00:01:23 +01:00
artica 20a0aefe84 Auto-updated build strings. 
Former-commit-id: aab4a872f690f104fe10dbdf7ef8ba86e02daef8
 2019-01-13 00:01:23 +01:00
artica 5abf8e14ff Auto-updated build strings. 
Former-commit-id: f78ab7f528f841aeda3dd7e28b1a2fcb34c9a05e
 2019-01-12 00:01:24 +01:00
artica ea34cc3b16 Auto-updated build strings. 
Former-commit-id: 0d164597ba66950d16573ad8b618164c24b578d1
 2019-01-11 00:01:25 +01:00
artica 00523128cf Auto-updated build strings. 
Former-commit-id: ea896e01eeba9faf882c98c4dbaa788b58d46f7b
 2019-01-10 00:01:25 +01:00
artica 344e5f1a6f Auto-updated build strings. 
Former-commit-id: a2919ff8afe0b64b756cc60b01a3145a02c8606a
 2019-01-09 00:01:23 +01:00
artica 02b497c250 Auto-updated build strings. 
Former-commit-id: 32c035216be628177ecd430d3c875e3dd504dccc
 2019-01-08 00:01:27 +01:00
artica dd922c41fc Auto-updated build strings. 
Former-commit-id: bb71b724086140b69a1314f914508cdbd2fc7776
 2019-01-07 00:01:28 +01:00
artica 48f1196400 Auto-updated build strings. 
Former-commit-id: 17e276d76c3ee7afa9866f8268d6dcb120485a0b
 2019-01-06 00:02:00 +01:00
artica cf1d28cf8b Auto-updated build strings. 
Former-commit-id: ed5de54f4a19cf94fad2d6978c0229928edcec6e
 2019-01-05 00:01:24 +01:00
fbsanchez eb1ce680d8 added accent compatibility Dataserver 
Former-commit-id: 039f7a5b776715c8c6a69bc6ab025dd9ff33fad9
 2019-01-04 10:42:24 +01:00
artica cfdde23d96 Auto-updated build strings. 
Former-commit-id: 051d9c9f6f96c740c40cf8afc900125ab5ec80e9
 2019-01-04 00:01:27 +01:00
fbsanchez cf15f715b6 safe_input in custom_field operations Dataserver 
Former-commit-id: 7cbb8fdb97a1265201f6dd5600ad58664cc89c29
 2019-01-03 18:00:49 +01:00
fbsanchez c5501e2b0a safe_input to custom field data received (dataserver) 
Former-commit-id: 4f38e951d02d7e3645b632cd0e48b52647565966
 2019-01-03 11:18:26 +01:00
artica d114a77151 Auto-updated build strings. 
Former-commit-id: c0c7f09435de019d1dc0057f48f4e5fd964fb3da
 2019-01-03 00:01:25 +01:00
artica 5c16c08d59 Auto-updated build strings. 
Former-commit-id: 1ce399660dc1fddf4ac163fdd4b7657cef8b6594
 2019-01-02 00:01:25 +01:00
artica ff9f6549d4 Auto-updated build strings. 
Former-commit-id: 9cd8d22d6cab6e4edaad7c4b184ec4bb4995b54f
 2019-01-01 00:01:24 +01:00
artica 5139308723 Auto-updated build strings. 
Former-commit-id: c78a0fd88b9100d3865413eb017d4dc0d8816b4c
 2018-12-31 11:24:46 +01:00
artica 4356a8ce8e Auto-updated build strings. 
Former-commit-id: 2971785cc199543f9d8e0e7fed646ec7aabd29d9
 2018-12-31 00:01:23 +01:00
artica 5e8b4b4500 Auto-updated build strings. 
Former-commit-id: f8005483f902558687e92a128c3c138d1323b141
 2018-12-30 00:01:22 +01:00
artica 60617def24 Auto-updated build strings. 
Former-commit-id: 5f0ff76fb4c03a0177dd9bb4b66609229cfec0b6
 2018-12-29 00:01:35 +01:00
artica fcfd68f102 Auto-updated build strings. 
Former-commit-id: 9885d1113e1e998bdb8c1d93d636c33f3dcc43c1
 2018-12-28 00:01:26 +01:00
artica 2043546c52 Auto-updated build strings. 
Former-commit-id: 58052cc9973e0315e5a3b470d0514a2fcff3d418
 2018-12-27 00:01:25 +01:00
artica 5377cf6039 Auto-updated build strings. 
Former-commit-id: fec5c338a7ebb5e8c86ba8cab22102dde9945978
 2018-12-26 00:01:25 +01:00
artica 34502da313 Auto-updated build strings. 
Former-commit-id: 4bd0f17766d00bdbc9761346e7f13d1959df61e8
 2018-12-25 00:01:28 +01:00
artica 86b1a3e424 Auto-updated build strings. 
Former-commit-id: ea35f14b67818e50e90f81c0f4daea2c77fdaeae
 2018-12-24 00:01:23 +01:00
artica c5d4f395f2 Auto-updated build strings. 
Former-commit-id: ab48062df957894db4ac37d0bc209c75eb12512a
 2018-12-23 00:01:25 +01:00
artica cba18381bd Auto-updated build strings. 
Former-commit-id: 32fc309340e7c464585f9ab5a459e40938176ce5
 2018-12-22 00:01:28 +01:00
artica 2d08c75bae Auto-updated build strings. 
Former-commit-id: c0f17d266dcf7dc801aa210e5a90cd16b6090145
 2018-12-21 00:01:27 +01:00
artica 8c20c93806 Auto-updated build strings. 
Former-commit-id: e8875f49f492708eca311bb984fe05fc9e766ea7
 2018-12-20 00:01:29 +01:00
artica 8a6033e002 Auto-updated build strings. 
Former-commit-id: deb6afebc4c6aa5a75442e984da3f173283f21e1
 2018-12-19 00:02:06 +01:00
samucarc 58289e73bc Added new functionality for CLI to delete policy agents. 
Former-commit-id: 753f9c47d2a4ffe8e5eb599dbd41d5b851500164
 2018-12-17 17:51:30 +01:00
Ramon Novoa bc36bb0534 Add support for exact matches to SNMP alerts. 
Ref pandora_enterprise#3214.


Former-commit-id: 35aa55d4d2ae236e614be7f4db50a9eb9f62aafa
 2018-12-17 15:40:00 +01:00
artica 7f9ee21b4b Auto-updated build strings. 
Former-commit-id: 95dbb73cfdfe00b7123c380c2ce5803bdd2aa754
 2018-12-17 00:01:27 +01:00
artica e1bce89923 Auto-updated build strings. 
Former-commit-id: a06da6638acbded07658431115057953bdcf417c
 2018-12-16 00:01:25 +01:00
artica 7af8f01b59 Auto-updated build strings. 
Former-commit-id: 67927d3968e9d40047b1a55468ea138c768abc3d
 2018-12-15 00:01:28 +01:00
samucarc 632d67095b List alert actions in nodes with CLI and API 
Former-commit-id: 11e9a8137a2a37b081fcbac2ee50cac27c2c208b
 2018-12-14 17:20:46 +01:00
artica b26d13db54 Auto-updated build strings. 
Former-commit-id: d07fdc3ff61ce6a947f38d250f6714124fe127d1
 2018-12-14 00:01:32 +01:00
artica 3d24bc264e Updated version and build strings. 
Former-commit-id: 2b99b30300329eb7f0a172f811fcfda8df1ab799
 2018-12-13 11:14:24 +01:00
artica 0648bf169c Auto-updated build strings. 
Former-commit-id: 77ac42e4d60650cc3fad6bc95333ac37f011aec3
 2018-12-13 00:01:36 +01:00
artica 266b12f40a Auto-updated build strings. 
Former-commit-id: 7fa7204ba6df07db86506062742d09fb14fe3b22
 2018-12-12 00:01:31 +01:00
samucarc 7f99a8f9f4 List and synchronize group of modules of the meta console with CLI 
Former-commit-id: 2fc699ee17ac08fe2d60746c0a3d8859a5083f7a
 2018-12-11 14:43:27 +01:00
fbsanchez d922b7084c moved pwrd to enterprise as it is an enterprise feature 
Former-commit-id: bcb73644fb6d068ac44b1c8c6523467988db441e
 2018-12-11 11:19:39 +01:00
artica 663c140b2b Auto-updated build strings. 
Former-commit-id: 19c220a8e630e3f5f50e04862cc696be6f278f02
 2018-12-11 00:01:27 +01:00
fermin831 e2bf9b37ba Updated help on create_agent 
Former-commit-id: 7dc4db7bf40be74d93692f8eab7effa299a3ac60
 2018-12-10 12:21:32 +01:00
fermin831 44f9a73a81 Added agent as name parameter in create_agent CLI function 
Former-commit-id: 1395aed8a79b8e26836ca523d457f939a006f5a1
 2018-12-10 12:17:12 +01:00
fermin831 32f665c761 Force to update the agent cache when an agent is created by server 
Former-commit-id: 0c00b9b2157e749bb33750a0715e16e91b02003c
 2018-12-10 11:15:13 +01:00
artica 7e40392740 Auto-updated build strings. 
Former-commit-id: b0e915bad1ff00a9c5c75276dd1234c97ea3319f
 2018-12-10 00:01:25 +01:00
artica 52520f151d Auto-updated build strings. 
Former-commit-id: 77fc145ae77c789a925853444723f45c6f43136a
 2018-12-09 00:01:27 +01:00
artica 9d65e6b27e Auto-updated build strings. 
Former-commit-id: 880eb1f55439b6ab5c4f0f86329377ff80bc2822
 2018-12-08 00:01:28 +01:00
artica e472612597 Auto-updated build strings. 
Former-commit-id: 8c3920b9c6a9f85574a5a3ad243b0a459c2a81ab
 2018-12-07 00:01:28 +01:00
artica 7d3b5664df Auto-updated build strings. 
Former-commit-id: 9536a5de43f0a3c635f058aa493d8bec3bf5d073
 2018-12-06 00:01:34 +01:00
vgilc e6bac9a195 Merge branch 'lab/selenium-docker' into 'develop' 
updates on pwrd, simplified

See merge request artica/pandorafms!2045

Former-commit-id: cfae76c639904ce34f2512ca1e4661826912c8eb
 2018-12-05 08:33:47 +01:00
artica fe47a9c07e Auto-updated build strings. 2018-12-05 00:01:38 +01:00
fbsanchez 60ac4e75df Fix PID path not absolute message on certain systems 
Former-commit-id: 91e9063535633dfd9d8e2fd5d309cfeb13d13131
 2018-12-04 21:37:25 +01:00
fbsanchez cff621338f Fixed file permissions pwrd 
Former-commit-id: d50a2df513e0ee567ba79e2d3a4873a0b92b0a21
 2018-12-04 21:28:43 +01:00
fbsanchez b542cb868b updated pwrd, installer now allows user/directory locations 
Former-commit-id: cb5c74a260dfcfadec820c0fbbd589e602ac6249
 2018-12-04 21:27:46 +01:00
fbsanchez b2758e6738 updates on pwrd, simplified 2018-12-04 18:22:11 +01:00
vgilc dfad4cf74f Merge branch 'pandora_enterprise/#3135-no-funciona-encriptacion-del-pandora_encrypt_db' into 'develop' 
Add a missing module to the Docker image and fix a related warning.

See merge request artica/pandorafms!2039
 2018-12-04 13:05:58 +01:00
Ramon Novoa e009ea5567 Add a missing module to the Docker image and fix a related warning. 2018-12-04 12:50:12 +01:00
artica 500601c67f Auto-updated build strings. 2018-12-04 00:01:28 +01:00
samucarc 517cb85547 Added new features in CLI to create and view alert commands 2018-12-03 17:38:57 +01:00
artica 76db57a8b6 Auto-updated build strings. 2018-12-03 00:01:26 +01:00
artica b5ac333dd4 Auto-updated build strings. 2018-12-02 00:01:27 +01:00
artica f18c7cfc08 Auto-updated build strings. 2018-12-01 00:01:45 +01:00
artica 2249ac4d8e Auto-updated build strings. 2018-11-30 00:01:26 +01:00
artica 4b1649d5f8 Auto-updated build strings. 2018-11-29 00:01:26 +01:00
Ramon Novoa 35cd33e446 Fix event replication for offline win32 nodes. 
Ref pandora_enterprise#3030.
 2018-11-28 13:33:15 +01:00
artica c48a0ffc49 Auto-updated build strings. 2018-11-28 00:01:25 +01:00
artica ad743d332e Auto-updated build strings. 2018-11-27 00:01:24 +01:00
artica b7546a5019 Auto-updated build strings. 2018-11-26 00:01:25 +01:00
artica 6bfe880dc8 Auto-updated build strings. 2018-11-25 00:01:24 +01:00
artica 53401e1f4d Auto-updated build strings. 2018-11-24 00:01:28 +01:00
artica c8969582a0 Auto-updated build strings. 2018-11-23 00:01:28 +01:00
nramon 3586403a08 Merge branch 'fix/win32-set-names' into 'develop' 
Fix encoding related issues.

See merge request artica/pandorafms!2009
 2018-11-22 12:34:24 +01:00
Ramon Novoa 1abe45c662 Fix encoding related issues. 
Ref pandora_enterprise#3031.
 2018-11-22 12:29:41 +01:00
nramon 0b4b60dec9 Merge branch 'fix/win32-set-names' into 'develop' 
Pandora's DB does not default to utf8 on win32 anymore. Thanks koichiro!

See merge request artica/pandorafms!2008
 2018-11-22 11:02:47 +01:00
Ramon Novoa c8f94e6756 Pandora's DB does not default to utf8 on win32 anymore. Thanks koichiro! 
Ref pandora_enterprise#3031.
 2018-11-22 10:49:56 +01:00
artica de77e52297 Auto-updated build strings. 2018-11-22 00:01:28 +01:00
Ramon Novoa 2480de2f9f Fix a typo in pandora_exec. 2018-11-21 16:20:26 +01:00
Ramon Novoa d912812127 Include Encode::CN, needed for cp936 support. 
Ref pandora_enterprise#3031.
 2018-11-21 12:17:22 +01:00
nramon 8735adc252 Merge branch 'feature/offline-license' into 'develop' 
Add support for offline licenses.

See merge request artica/pandorafms!2001
 2018-11-21 12:10:13 +01:00
Ramon Novoa 054546fd0f Add support for offline licenses. 
Ref pandora_enterprise#3098.
 2018-11-21 12:05:20 +01:00
artica fd6d830de3 Auto-updated build strings. 2018-11-21 00:01:25 +01:00
artica 01ba290a68 Auto-updated build strings. 2018-11-20 00:01:29 +01:00
artica ce5c679ad6 Auto-updated build strings. 2018-11-19 00:01:29 +01:00
artica f2bf27d367 Auto-updated build strings. 2018-11-18 00:01:28 +01:00
artica 4021af48f9 Auto-updated build strings. 2018-11-17 00:01:31 +01:00
fbsanchez 2a110e11c8 retried db query on error 1205 - lock 2018-11-16 10:28:49 +01:00
artica a0fde9503f Auto-updated build strings. 2018-11-16 00:01:29 +01:00
artica e9e132589c Auto-updated build strings. 2018-11-15 00:01:29 +01:00
artica 633d6987eb Auto-updated build strings. 2018-11-14 00:01:29 +01:00
artica f308e1f590 Updated version and build strings. 2018-11-13 15:59:16 +01:00
vgilc 72691ffe8d Merge branch '2677-no-se-elimina-parent-id-entre-modulos-del-mismo-agente' into 'develop' 
Fixed bug in modules deletion: parent id set to 0 in case parent has been deleted

See merge request artica/pandorafms!1961
 2018-11-13 08:37:45 +01:00
artica e29160f34d Auto-updated build strings. 2018-11-13 00:01:29 +01:00
alejandro-campos e45dc3a981 Fixed bug in modules deletion: parent id set to 0 in case parent has been deleted 2018-11-12 18:39:14 +01:00
Ramon Novoa be79ae83fb Remove a semaphore that is no longer needed. Thanks fbsanchez! 
Ref pandora_enterprise#3060.
 2018-11-12 15:32:37 +01:00
artica 0dd6c54651 Auto-updated build strings. 2018-11-12 00:01:25 +01:00
artica 4f928c8c22 Auto-updated build strings. 2018-11-11 00:01:25 +01:00
artica 76b24c3214 Auto-updated build strings. 2018-11-10 00:01:28 +01:00
artica 2ed98eac77 Auto-updated build strings. 2018-11-09 00:01:27 +01:00
artica d28b229423 Auto-updated build strings. 2018-11-08 00:01:29 +01:00
fbsanchez df5e6daf7b re evaluate enterprise capabilities on configuration reload 2018-11-07 15:59:19 +01:00
fbsanchez 7407431343 re-initialize pandorafms_server after configuration change 2018-11-07 14:57:20 +01:00
vgilc c7a54182a3 Merge branch '6219_Comprobacion_Paradas_planificadas_CLI_2' into 'develop' 
Added check for the creation of planned downtimes by pandora manage

See merge request artica/pandorafms!1936
 2018-11-07 08:48:48 +01:00
artica a01f79d294 Auto-updated build strings. 2018-11-07 00:01:31 +01:00
samucarc a80c7e493e Added check for the creation of planned downtimes by pandora manage 2018-11-06 16:42:03 +01:00
vgilc 919a800a0a Revert "Merge branch '2677-No-se-elimina-parent-id-entre-modulos-del-mismo-agente' into 'develop'" 
This reverts merge request !1727
 2018-11-06 16:41:15 +01:00
vgilc 62b27284aa Merge branch '3000-lost-in-stash' into 'develop' 
ondemand pluginTools, pandora_df inodes, cde functions_api cluster options

See merge request artica/pandorafms!1919
 2018-11-06 15:03:36 +01:00
fbsanchez bfc669225c Merge remote-tracking branch 'origin/develop' into 3000-lost-in-stash 2018-11-06 14:48:14 +01:00
artica 3ffad9fda8 Auto-updated build strings. 2018-11-06 00:01:27 +01:00
artica 50b8886916 Auto-updated build strings. 2018-11-05 00:01:25 +01:00
artica f9e2936df5 Auto-updated build strings. 2018-11-04 00:01:25 +01:00
artica afd922426e Auto-updated build strings. 2018-11-03 00:01:27 +01:00
artica fc82a9d172 Auto-updated build strings. 2018-11-02 00:01:26 +01:00
artica f47918b4cc Auto-updated build strings. 2018-11-01 00:01:31 +01:00
fbsanchez 7f093b29e3 Merge remote-tracking branch 'origin/develop' into 2716-ue-plugin-modifications 2018-10-31 15:48:57 +01:00
artica d9f8616b2c Auto-updated build strings. 2018-10-31 00:01:26 +01:00
fbsanchez 8fe82add30 ondemand pluginTools, pandora_df inodes, cde functions_api cluster options 2018-10-30 17:53:57 +01:00
vgilc e1fdd5692b Merge branch 'fix/pandora_enterprise#2355-compatibilidad-windows' into 'develop' 
Quote the fping binary before calling it.

See merge request artica/pandorafms!1915
 2018-10-30 14:43:21 +01:00
Ramon Novoa a142a32349 Quote the fping binary before calling it. 2018-10-30 13:23:01 +01:00
artica 5a057490ad Auto-updated build strings. 2018-10-30 00:01:29 +01:00
vgilc 4d689d3ce8 Merge branch 'fix/recon-notinit-inoutoctets' into 'develop' 
Check that SNMP in/outoctet modules respond.

See merge request artica/pandorafms!1904
 2018-10-29 13:08:40 +01:00
Ramon Novoa 20d6c30416 Check that SNMP in/outoctet modules respond. 2018-10-29 12:09:35 +01:00
vgilc 88da8d8d9a Merge branch 'fix/incremental-min-max' into 'develop' 
Process incremental modules before checking limits.

Closes pandora_enterprise#2213

See merge request artica/pandorafms!1903
 2018-10-29 09:18:16 +01:00
artica 696abbdead Auto-updated build strings. 2018-10-29 00:01:25 +01:00
artica 507bbcff56 Auto-updated build strings. 2018-10-28 00:01:22 +02:00
artica 01e9251a88 Auto-updated build strings. 2018-10-27 00:01:26 +02:00
Ramon Novoa c5aba438b4 Process incremental modules before checking limits. 
Fixes pandora_enterprise#2213.
 2018-10-26 15:44:16 +02:00
vgilc 7a4b7d4289 Merge branch '2221-Actualizacion_de_Pandora_a_version_7_de_PHP' into 'develop' 
2221 actualizacion de pandora a version 7 de php

See merge request artica/pandorafms!1875
 2018-10-26 14:41:15 +02:00
artica dba51e07b3 Auto-updated build strings. 2018-10-26 00:01:33 +02:00
daniel 0b0bad8a73 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 
Conflicts:
	pandora_console/extras/mr/22.sql
	pandora_console/include/chart_generator.php
	pandora_console/include/functions_graph.php
	pandora_console/include/functions_reporting.php
	pandora_console/include/functions_reporting_html.php
	pandora_console/include/graphs/fgraph.php
 2018-10-25 17:43:28 +02:00
vgilc ea0474e704 Merge branch '2677-No-se-elimina-parent-id-entre-modulos-del-mismo-agente' into 'develop' 
Fixed bug in modules deletion: parent id set to 0 in case parent has been deleted

See merge request artica/pandorafms!1727
 2018-10-25 10:37:11 +02:00
vgilc 816811b5b7 Merge branch 'fix/pandora_enterprise#2808-badxml' into 'develop' 
Prevent the counter from overflowing often when server_threshold is low.

See merge request artica/pandorafms!1837
 2018-10-25 10:33:58 +02:00
artica db802c5a2e Auto-updated build strings. 2018-10-25 00:01:22 +02:00
artica 7a64bb4855 Auto-updated build strings. 2018-10-24 00:01:28 +02:00
artica 9a77256198 Auto-updated build strings. 2018-10-23 00:01:29 +02:00
artica f899910dd0 Updated version and build strings. 2018-10-22 09:45:06 +02:00
daniel 6bb478ea1a Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 2018-10-22 08:04:36 +02:00
artica 1d0d656996 Auto-updated build strings. 2018-10-22 00:01:23 +02:00
artica b01362a873 Auto-updated build strings. 2018-10-21 00:01:26 +02:00
artica 5ced50863c Auto-updated build strings. 2018-10-20 00:01:25 +02:00
daniel ffc7734ebc delete flash_charts and library pchart 2018-10-19 11:31:06 +02:00
artica f340a3dda0 Auto-updated build strings. 2018-10-19 00:01:26 +02:00
artica 0c39e321e4 Auto-updated build strings. 2018-10-18 00:01:24 +02:00
artica fd53704dc0 Auto-updated build strings. 2018-10-17 00:01:34 +02:00
artica 9675c6ce52 Auto-updated build strings. 2018-10-16 00:01:27 +02:00
artica 35e1234b3c Auto-updated build strings. 2018-10-15 00:01:24 +02:00
artica 44be4aea57 Auto-updated build strings. 2018-10-14 00:01:23 +02:00
artica b0e56cd506 Auto-updated build strings. 2018-10-13 00:01:24 +02:00
artica 179f3f0526 Auto-updated build strings. 2018-10-12 00:01:28 +02:00
artica d087665d1e Auto-updated build strings. 2018-10-11 00:01:56 +02:00
artica 1694fccd83 Auto-updated build strings. 2018-10-10 00:01:47 +02:00
artica 51c4fbece2 Auto-updated build strings. 2018-10-09 00:01:25 +02:00
artica 76da7384b6 Auto-updated build strings. 2018-10-08 00:01:23 +02:00
artica 5171ef79b0 Auto-updated build strings. 2018-10-07 00:01:23 +02:00
artica a40057b3ff Auto-updated build strings. 2018-10-06 00:01:29 +02:00
artica ec8d36f8eb Auto-updated build strings. 2018-10-05 00:01:30 +02:00
fbsanchez b67eb9ae16 PluginTools Added global alerts to parse_arguments 2018-10-04 17:30:48 +02:00
artica 7ac581ac1e Auto-updated build strings. 2018-10-04 00:01:27 +02:00
artica f39788d8ef Auto-updated build strings. 2018-10-03 00:01:28 +02:00
Ramon Novoa eba9c58f18 Prevent the counter from overflowing often when server_threshold is low. 2018-10-02 12:43:39 +02:00
artica 08a3aabdf2 Auto-updated build strings. 2018-10-02 00:01:33 +02:00
artica 779f3c6c60 Auto-updated build strings. 2018-10-01 00:01:23 +02:00
artica 46373616fa Auto-updated build strings. 2018-09-30 00:01:22 +02:00
artica 2606b73e57 Auto-updated build strings. 2018-09-29 00:01:27 +02:00
vgilc 6a6bae10b1 Merge branch 'ent-2782-ue-agente-software-en-modo-standby' into 'develop' 
Ent 2782 ue agente software en modo standby

See merge request artica/pandorafms!1800
 2018-09-28 10:04:12 +02:00
artica 1a60aee7a6 Auto-updated build strings. 2018-09-28 00:01:25 +02:00
artica 79961b91d0 Auto-updated build strings. 2018-09-27 00:01:24 +02:00
artica 643da5c993 Auto-updated build strings. 2018-09-26 00:01:28 +02:00
fermin831 87fa7a7125 Added --set_disabled_and_standby to CLI 2018-09-25 13:42:29 +02:00
artica f280e54738 Auto-updated build strings. 2018-09-25 00:01:26 +02:00
artica 010207e6ad Auto-updated build strings. 2018-09-24 00:01:23 +02:00
artica bd0176070a Auto-updated build strings. 2018-09-23 00:01:23 +02:00
artica 25f91a451e Auto-updated build strings. 2018-09-22 00:01:24 +02:00
Junichi Satoh d4d978c9ad Fixed that monthly type of planned downtime is not executed at intended time. 
And fixed comments.
 2018-09-21 11:10:50 +09:00
artica fa05ecc477 Auto-updated build strings. 2018-09-21 00:01:24 +02:00
artica dcb3d7d7b9 Auto-updated build strings. 2018-09-20 00:01:25 +02:00
fbsanchez 401583e605 Merge remote-tracking branch 'origin/develop' into 2078-ue-cmdb-integration 2018-09-19 11:13:54 +02:00
artica 687a742746 Auto-updated build strings. 2018-09-19 00:01:28 +02:00
artica bcfda72269 Updated version and build strings. 2018-09-18 16:39:44 +02:00
manuel.montes 65010d7080 Merge remote-tracking branch 'origin/develop' into 2497-Especificar-version-SNMP-en-tarea-de-reconocimiento-Lead-21487 
Conflicts:
	pandora_console/extras/mr/20.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/pandoradb.sql
 2018-09-18 11:17:47 +02:00
artica abc7e2cb3c Auto-updated build strings. 2018-09-18 00:01:27 +02:00
fermin831 0d164fc3e0 Removed unwanted trace 2018-09-17 16:38:02 +02:00
fermin831 146dab5caa Added SNMP v1, v2, v2c and v3 to Network Sweep recon 2018-09-17 14:36:52 +02:00
artica 921a025262 Auto-updated build strings. 2018-09-17 00:01:24 +02:00
artica 4f6aff52c7 Auto-updated build strings. 2018-09-16 00:01:23 +02:00
artica 591db5001f Auto-updated build strings. 2018-09-15 00:01:24 +02:00
fbsanchez 75cb3c9229 Merge remote-tracking branch 'origin/develop' into 2078-ue-cmdb-integration 2018-09-14 09:20:48 +02:00
artica dff3fb7d0d Auto-updated build strings. 2018-09-14 00:01:27 +02:00
fbsanchez 33f3bb57e6 Minor fixes 2018-09-13 20:36:20 +02:00
artica c54f414a73 Updated version and build strings. 2018-09-13 15:53:21 +02:00
artica 583a7475e4 Auto-updated build strings. 2018-09-13 00:01:26 +02:00
fermin831 861e25fe43 Added no verify ssl in server daemon 2018-09-12 13:20:46 +02:00
vgilc 1bdfaed293 Merge branch 'ent-2153-vistas-en-las-que-no-se-ha-tenido-en-cuenta-los-grupos-secundarios-2' into 'develop' 
Ent 2153 vistas en las que no se ha tenido en cuenta los grupos secundarios 2

See merge request artica/pandorafms!1750
 2018-09-12 10:21:09 +02:00
fermin831 006b086366 [Secondary groups] Fixed tgroup_stat calculation and improve performance. 2018-09-12 09:07:29 +02:00
artica cef1b10ade Auto-updated build strings. 2018-09-12 00:01:26 +02:00
artica f7940908c2 Auto-updated build strings. 2018-09-11 00:01:25 +02:00
artica 003b734f4e Auto-updated build strings. 2018-09-10 00:01:22 +02:00
artica 6ae51b5e34 Auto-updated build strings. 2018-09-09 00:01:23 +02:00
artica cc4de37515 Auto-updated build strings. 2018-09-08 00:01:53 +02:00
artica fb68f3f9b6 Auto-updated build strings. 2018-09-07 00:01:31 +02:00
fbsanchez d0a82c436a Merge remote-tracking branch 'origin/develop' into 2078-ue-cmdb-integration 2018-09-06 11:39:58 +02:00
artica 647a324368 Auto-updated build strings. 2018-09-06 00:01:26 +02:00
fbsanchez d46240a200 Merge remote-tracking branch 'origin/develop' into 2078-ue-cmdb-integration 2018-09-05 16:52:18 +02:00
artica 05d0bb0f5d Auto-updated build strings. 2018-09-05 00:01:26 +02:00
alejandro-campos 997b1e21d7 Fixed bug in modules deletion: parent id set to 0 in case parent has been deleted 2018-09-04 12:26:47 +02:00
artica 60360d8764 Auto-updated build strings. 2018-09-04 00:01:27 +02:00
fbsanchez 8f4e8c3110 Improved LWP ssl ignore certificate added extra debug 2018-09-03 11:26:01 +02:00
artica b52661054d Auto-updated build strings. 2018-09-03 00:01:24 +02:00
artica 06b36965a2 Auto-updated build strings. 2018-09-02 00:01:23 +02:00
artica 97c562163e Auto-updated build strings. 2018-09-01 00:01:24 +02:00
artica 43a7d4973b Auto-updated build strings. 2018-08-31 00:01:28 +02:00
Junichi Satoh 34c553f5b4 Fixed plugin timeout. 2018-08-30 13:30:22 +09:00
artica 9d35a66ad3 Auto-updated build strings. 2018-08-30 00:01:25 +02:00
artica 91bdb0094a Auto-updated build strings. 2018-08-29 00:01:26 +02:00
artica 7c37a7d2ee Auto-updated build strings. 2018-08-28 00:01:27 +02:00
vgilc 69545d7ed8 Merge branch 'ent-2153-vistas-en-las-que-no-se-ha-tenido-en-cuenta-los-grupos-secundarios' into 'develop' 
Ent 2153 vistas en las que no se ha tenido en cuenta los grupos secundarios

See merge request artica/pandorafms!1708
 2018-08-27 09:10:00 +02:00
vgilc f0494ea598 Merge branch 'fix/out-of-order-data-6120' into 'develop' 
Do not update tagente_estado when processing out-of-order data.

See merge request artica/pandorafms!1624
 2018-08-27 09:07:06 +02:00
artica 930a939764 Auto-updated build strings. 2018-08-27 00:01:22 +02:00
artica 6a99bb9aec Auto-updated build strings. 2018-08-26 00:01:22 +02:00
artica f345c01e3e Auto-updated build strings. 2018-08-25 00:01:25 +02:00
artica 733be2d8ba Auto-updated build strings. 2018-08-24 00:01:24 +02:00
artica 80cec1aadb Auto-updated build strings. 2018-08-23 00:01:29 +02:00
artica 99858d3371 Auto-updated build strings. 2018-08-22 00:01:27 +02:00
fermin831 0a70284eaa [Secondary groups] Group report and adapted group_stat table to secondary groups 2018-08-21 13:34:52 +02:00
artica e518135adf Auto-updated build strings. 2018-08-21 00:01:24 +02:00
artica ad6a3d69e8 Auto-updated build strings. 2018-08-20 00:01:20 +02:00
artica c79b06e43c Auto-updated build strings. 2018-08-19 00:01:22 +02:00
artica 693f9617ac Auto-updated build strings. 2018-08-18 00:01:26 +02:00
Junichi Satoh a46b39a764 Fixed month_have_days(), wrong calculation for leap year. 2018-08-17 13:33:12 +09:00
artica 839a91b0ac Auto-updated build strings. 2018-08-17 00:01:25 +02:00
artica 7ac2745b9e Auto-updated build strings. 2018-08-16 00:01:21 +02:00
artica b222c6627a Auto-updated build strings. 2018-08-15 00:01:24 +02:00