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

4308 Commits

Author SHA1 Message Date
Daniel Rodriguez
5bc10915da Merge branch 'ent-3451-retoques-ipam' into 'develop' 
added pandora_block_ping to check response of multiple addresses

See merge request artica/pandorafms!2147

Former-commit-id: 6adf7e7f59beba0d1f579ab267fd40d0c21a24c4
 2019-01-29 15:58:00 +01:00
artica
cec6aedaf5 Updated version and build strings. 
Former-commit-id: 3ba62782db1b3eac4caafb21b5491d249f5a9b44
 2019-01-29 11:08:54 +01:00
artica
354834a872 Auto-updated build strings. 
Former-commit-id: b59b540696e6f36d82e154a9aefea75519e9adac
 2019-01-29 00:01:27 +01:00
fbsanchez
d0d95cbca5 added pandora_block_ping to check response of multiple addresses 
Former-commit-id: a2202f029e0fae80f3156a1a10afca0fe18c7ac2
 2019-01-28 20:02:58 +01:00
samucarc
cf2b9c5798 Fixed conflicts 
Former-commit-id: 1be548acda51690c59d03e7270810ad03bb16822
 2019-01-28 15:35:37 +01:00
artica
550abc6634 Auto-updated build strings. 
Former-commit-id: b2b65befe5f01bb047fe48f25c4f33eacc277d41
 2019-01-28 00:01:23 +01:00
artica
dd9f6e5f21 Auto-updated build strings. 
Former-commit-id: 92bbfc8b4c06e1873fe92c9f3b31ddc43d070a1d
 2019-01-27 00:01:29 +01:00
artica
50036f2120 Auto-updated build strings. 
Former-commit-id: 18dc882c6097c97f606ffc45e592f2118b4890cc
 2019-01-26 00:01:25 +01:00
daniel
61c9603ae8 Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan 
Former-commit-id: ec5c28bb52343952fd644c1f999d3b5ef04cd709
 2019-01-25 09:55:09 +01:00
artica
d191cdef17 Auto-updated build strings. 
Former-commit-id: 0c056fa59423bd4342f513f80bd0a49a9df0dddd
 2019-01-25 00:01:33 +01:00
artica
f9113fa2e5 Auto-updated build strings. 
Former-commit-id: 4593b36762b46a3b621d39318cb7a9e5b437db52
 2019-01-24 00:01:27 +01:00
daniel
841a9cf60b Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan 
Former-commit-id: a23fffb984a6edd4ef7eefe871814ea0120c615a
 2019-01-23 11:08:48 +01:00
artica
1e4a288f53 Auto-updated build strings. 
Former-commit-id: d02bc496b37ddd35ad1a75174daa0b3ca6d24f24
 2019-01-23 00:01:23 +01:00
daniel
2e2774f256 Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan 
Conflicts:
	pandora_server/lib/PandoraFMS/DataServer.pm


Former-commit-id: 5729e346de91ebf8897bc5d0dbc9f3f451711e86
 2019-01-22 17:42:47 +01:00
fermin831
1ecd656513 Data server can handle several events from a single agent 
Former-commit-id: 2f47df007eb27cf181b130aac79d35698de67387
 2019-01-22 12:59:54 +01:00
Daniel Rodriguez
f1dbd40a6a Merge branch 'ent-3421-error-en-un-push' into 'develop' 
Ent 3421 error en un push

See merge request artica/pandorafms!2138

Former-commit-id: 6740a7f61adebbacaeb40b47b42973e4b518d12d
 2019-01-22 10:04:07 +01:00
daniel
4236b55694 Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan 
Conflicts:
	pandora_server/lib/PandoraFMS/DataServer.pm


Former-commit-id: 87b7d3a7591ed181be022b786deba8f090e43d49
 2019-01-22 09:00:47 +01:00
artica
c586b68cb3 Auto-updated build strings. 
Former-commit-id: 84dcfe707e9a70754b4ee72365bd549c8d1c09ef
 2019-01-22 00:01:24 +01:00
fermin831
c9e11780bb Added matrix_data XML 
Former-commit-id: 8b927f2e3fd2c78058d4a736c371e4274c94bc1a
 2019-01-21 18:49:20 +01:00
fermin831
e5eab4ca67 Added events in DataServer processed XML 
Former-commit-id: db7be33ef7e6e5f58106dfef2cfb042637624f27
 2019-01-21 18:49:00 +01:00
fermin831
e540d96eb2 Revert "Added events in DataServer processed XML" 
This reverts commit cbe518dc53855766ce440babe6d021791987789e [formerly e3166d9fb2bcbf1b6aa574ae1a96e796a26a70a6].


Former-commit-id: 759a3da8b31fef88d2d7b22daeae09062f3bd80c
 2019-01-21 18:43:47 +01:00
fermin831
64b8223f12 Revert "Added matrix_data XML" 
This reverts commit d970c6628a9535a7556e4f2d4493df1866ed9c7b [formerly cd26d436e6745a456df95484120d1b96439b274d].


Former-commit-id: 7f5d3d628605a2458622174edcd56916a3a63cd9
 2019-01-21 18:43:09 +01:00
fermin
c75f94f9e0 Merge branch 'ent-3418-nueva-estructura-de-datos-tnetworkmatrix' into 'develop' 
Ent 3418 nueva estructura de datos tnetworkmatrix

See merge request artica/pandorafms!2136

Former-commit-id: b04eaee2ce78625f9710b0851609ca8dfa2aea43
 2019-01-21 18:32:05 +01:00
fermin831
d970c6628a Added matrix_data XML 
Former-commit-id: cd26d436e6745a456df95484120d1b96439b274d
 2019-01-21 18:27:31 +01:00
fbsanchez
f77373aa1d Plugintools added ip2long & long2ip 
Former-commit-id: 5c5f9589a32947ce2d9a725e504661a11c8311ee
 2019-01-21 18:06:44 +01:00
fermin831
cbe518dc53 Added events in DataServer processed XML 
Former-commit-id: e3166d9fb2bcbf1b6aa574ae1a96e796a26a70a6
 2019-01-21 15:12:46 +01:00
daniel
dc24599f18 Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan 
Former-commit-id: f89cf021526d5e7f9fcaad080d0f8721c20c82cb
 2019-01-21 09:22:42 +01:00
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
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
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