Commit Graph

13540 Commits

Author SHA1 Message Date
Arturo Gonzalez 50a8cc98e4 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2016-12-19 13:06:22 +01:00
Arturo Gonzalez d9c64e2066 Fixed agents/modules report. Ticket #4183 2016-12-19 13:06:07 +01:00
m-lopez-f 94191afe7d Remove debug trace 2016-12-19 12:44:07 +01:00
cesar991 0c8f5ad8e3 Add @is_enterprise in Views.py 2016-12-19 12:25:09 +01:00
cesar991 617d881236 Test to check the views of pandora 2016-12-19 11:51:43 +01:00
daniel 9efccf33e8 fixed minor error SLA dinamic
(cherry picked from commit 0200fa8263)
2016-12-19 09:41:30 +01:00
artica 021eb37ba5 Auto-updated build strings. 2016-12-18 00:01:11 +01:00
artica 5930edd610 Auto-updated build strings. 2016-12-17 00:01:14 +01:00
Arturo Gonzalez 4e81c4c21b Added some things to agents/modules report. 2016-12-16 14:08:55 +01:00
daniel 7056de8070 fixed minor error 2016-12-16 12:47:37 +01:00
daniel 8c40b6a1d0 fixed error Function does not exist 2016-12-16 12:26:35 +01:00
enriquecd ef42605f4e Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2016-12-16 10:31:30 +01:00
enriquecd bc44e5b671 Add create_web_module and create_policy_web_module functions #4261 2016-12-16 10:30:16 +01:00
artica 72c5160326 Auto-updated build strings. 2016-12-16 00:01:13 +01:00
daniel 5352de9294 fixed error new sla in metaconsole
(cherry picked from commit d84b2c6c3e)
2016-12-15 15:33:13 +01:00
daniel a678177020 add legend SLA reports 2016-12-15 10:25:34 +01:00
artica 8c02779ee9 Auto-updated build strings. 2016-12-15 00:01:14 +01:00
daniel 729cc5b8be add new images for reports sla 2016-12-14 16:26:54 +01:00
Arturo Gonzalez e59dc3af21 Added new field to create and update modules (parent_module_id). Ticket #122 GitLab 2016-12-14 16:04:04 +01:00
daniel b28fe4cef4 Merge branch 'develop' into feature/report_SLA_new 2016-12-14 15:42:18 +01:00
daniel fb942ab6cf fixed error and visual erros pdf, xml, csv, json 2016-12-14 14:02:00 +01:00
Arturo Gonzalez e1b3f115e0 Added separated field to purge inventory data. Ticket #128 GitLab 2016-12-14 13:02:10 +01:00
Ramon Novoa 01217fe3b2 Add support to link modules via XML data files. 2016-12-14 12:59:31 +01:00
Arturo Gonzalez e2518338f6 Added image to nost init modules in tree view. Ticket #4264 2016-12-14 10:55:28 +01:00
Arturo Gonzalez 8eb60e5a7b Fixed table field in user list. Ticket #4270 2016-12-14 09:37:21 +01:00
artica 3675df6113 Auto-updated build strings. 2016-12-14 00:01:12 +01:00
Ramon Novoa c11b1c1150 Parse group_id XML attributes. 2016-12-13 15:03:30 +01:00
Ramon Novoa 8ec5f53100 Added a new group_id configuration option (win32). 2016-12-13 15:02:39 +01:00
Ramon Novoa 9919322ba4 Added a new group_id configuration option. 2016-12-13 15:01:02 +01:00
m-lopez-f c75a5a86f4 Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2016-12-13 13:11:18 +01:00
m-lopez-f b8453a346b Fixed problems with total events in list of events. Ticket: #4243
(cherry picked from commit 3ccb068e09)
2016-12-13 13:11:04 +01:00
Arturo Gonzalez 8b6caf8628 Added new icon to sound events console. Ticket #109 GitLab 2016-12-13 12:15:07 +01:00
artica 820ff676dc Auto-updated build strings. 2016-12-13 00:01:16 +01:00
daniel 2b0820d70e add new reports sla_hourly , weekly and availability graph 2016-12-12 16:48:25 +01:00
nramon 58fe27a664 Merge branch 'feature/123-deteccion-de-ekid-automatica' into 'develop'
Feature/123 deteccion de ekid automatica

Closes Issue artica/pandora_enterprise#123

See merge request !3
2016-12-12 12:12:46 +01:00
Ramon Novoa eadb6b2360 Create the eHorusID custom field by default. 2016-12-12 12:07:58 +01:00
artica d8ddf49e97 Auto-updated build strings. 2016-12-11 00:01:12 +01:00
artica 3ee06679f9 Auto-updated build strings. 2016-12-10 00:01:11 +01:00
artica d1552cc8c2 Auto-updated build strings. 2016-12-09 00:01:14 +01:00
Junichi Satoh 85475bd6cc Fixed that exported csv file of audit log contains unnecessary data. 2016-12-08 09:35:34 +09:00
artica 14c5ec6b87 Auto-updated build strings. 2016-12-08 00:01:13 +01:00
enriquecd 117c45a25e Add snapshot button in tree view dialog window and center image in snapshot window #90
(cherry picked from commit adf7cc07f9)
2016-12-07 17:16:52 +01:00
enriquecd 7c1e3b9a07 Add total evens count in reports header - #3162
(cherry picked from commit 0b1454f0e8)
2016-12-07 15:57:08 +01:00
Ramon Novoa 2ee3225e56 Send the eHorus key as a custom field (win32). 2016-12-07 15:54:52 +01:00
Ramon Novoa a5cc574061 Send the eHorus key as a custom field. 2016-12-07 15:52:41 +01:00
Junichi Satoh 6edc5e1439 Fixed warnings. 2016-12-07 17:29:04 +09:00
artica 2ca7276443 Auto-updated build strings. 2016-12-07 00:01:12 +01:00
Hirofumi Kosaka 5d5164c2c0 Added package dependency (tentacle_client depends on it). 2016-12-06 18:29:15 +09:00
artica f6ddfa0fd4 Auto-updated build strings. 2016-12-06 00:01:13 +01:00
Ramon Novoa e8e1eeaed3 Read the eHorus key if available. 2016-12-05 15:29:05 +01:00