Commit Graph

998 Commits

Author SHA1 Message Date
malbarral
be24c5c113 Minor fix 2017-08-17 05:50:36 -04:00
malbarral
f3a72349d4 Fixing discover agent filter
Conflicts:
	public/templates/agents-audit.html
	public/templates/agents-fim.html
	public/templates/agents-oscap.html
	public/templates/agents-overview.html
	public/templates/agents-pci.html
	public/templates/agents-pm.html
2017-08-17 05:49:30 -04:00
malbarral
e3fa831050 Some changes and adding again OS platform filter
Conflicts:
	public/controllers/agentsPreview.js
	public/templates/agents-preview.html
	public/templates/overview-general.html
2017-08-17 05:41:49 -04:00
Javier Castro
fa78501e7d Merge pull request #103 from wazuh/3.0-fix_last_scan
Fixing last scan data retrieval for syscheck and rootcheck.
2017-08-16 16:17:26 +02:00
havidarou
163e187b5a Fixing last scan data retrieval for syscheck and rootcheck. 2017-08-16 10:14:06 -04:00
Pedro Sanchez
085e247ee1 Merge from 'adding-clusters' 2017-08-13 19:01:14 -04:00
Pedro Sanchez
6f90c7495c Discover: Cluster name filter 2017-08-13 18:46:58 -04:00
Pedro Sanchez
9e9d88f90a Adapting templates to cluster.name filter 2017-08-13 18:40:58 -04:00
Pedro Sanchez
4e637cc5e8 App compatibility with Wazuh Cluster
Requesting info from API /cluster/node
Agents panels and visualization filter for Agent ID instead Agent Name.
Visualization filters are now set globally in Controllers.
Setting tab now request Cluster info: manager, node and name.
Alerts count now use cluster filters and agent id.
Top/last counts now use cluster filters and agent id.
2017-08-13 15:56:50 -04:00
malbarral
b8d5a942ef Minor fix 2017-08-12 21:32:53 +02:00
Manuel Albarral
bb53f63f67 Simplifying solution 2017-08-11 21:28:42 +02:00
Manuel Albarral
e94fae6b00 Fixing agent filters in Discover tab 2017-08-11 21:02:38 +02:00
Manuel Albarral
5603a024ec Adding cluster in API settings 2017-08-11 20:39:22 +02:00
malbarral
a481408219 Fixing discover agent filter 2017-08-11 11:15:22 +02:00
malbarral
ab6c4b15c4 Some changes and adding again OS platform filter 2017-08-10 21:48:14 +02:00
malbarral
89ad403588 App 3.0 working with Kibana 5.4.0 2017-08-10 21:24:21 +02:00
malbarral
49b554403a Removing OS filters in agents preview tab 2017-08-10 17:57:35 +02:00
malbarral
669d9b4b18 Restyling agent action buttons 2017-08-10 17:33:33 +02:00
malbarral
91741b33b3 Updating restart agent message 2017-08-10 17:01:42 +02:00
Manuel Albarral
898443f547 Formatting OS info in manager and agent tabs
Formatting os name
2017-08-10 16:39:06 +02:00
malbarral
15fe4a8f70 Merge branch '3.0' of github.com:wazuh/wazuh-kibana-app-dev into formatting-os-name-92
Conflicts:
	public/templates/agents-overview.html
2017-08-10 16:37:20 +02:00
malbarral
6e92b63aa3 Formatting OS info in manager and agent tabs 2017-08-10 16:34:37 +02:00
malbarral
c2df9f6ddc Centering cards in agent tab 2017-08-10 14:29:01 +02:00
malbarral
df6c872a05 Centering cards in agent tab 2017-08-10 14:27:07 +02:00
malbarral
f74488bb4b Hiding OSCAP and AUDIT tab in Windows agents 2017-08-10 13:18:49 +02:00
malbarral
9159643ae1 Adding agent version in preview agents tab 2017-08-10 12:53:29 +02:00
malbarral
cb89a61c64 Fixing visualization filters in templates 2017-08-08 22:26:19 +02:00
malbarral
5665d1c97d Merge branch '3.0' of github.com:wazuh/wazuh-kibana-app-dev into 3.0 2017-08-08 21:22:17 +02:00
malbarral
1a8dd18f71 Fixing templates 2017-08-08 21:19:00 +02:00
Javier Castro
87fa1868a7 Merge pull request #82 from wazuh/3.0-html_modifications_#81
Modifying HTML code for the new structure.
2017-08-08 21:07:23 +02:00
root
16e231b1c1 Modifying HTML code for the new structure. 2017-08-08 15:06:08 -04:00
malbarral
bfd5ef284e Minor changes 2017-08-08 18:40:43 +02:00
malbarral
a7a2a3a2fb Using the new structure in dashboard fields 2017-08-08 17:26:19 +02:00
Javier Castro
d4236c5401 Merge pull request #78 from wazuh/3.0-new_templates-#77
Adding new sample alert and templates for Kibana app.
2017-08-08 16:34:07 +02:00
root
53324a6c58 Adding new sample alert and templates for Kibana app. 2017-08-08 10:29:45 -04:00
Manuel Albarral
122e0b320e Update CHANGELOG.md 2017-08-07 17:44:05 +02:00
malbarral
bf237f0363 Merge branch '2.1' of https://github.com/wazuh/wazuh-kibana-app-dev into 2.1 2017-08-07 16:44:08 +02:00
Manuel Albarral
8ea4d0d20e Merge pull request from wazuh/hiding-add-agent-dialog
Hiding add agent dialog
2017-08-03 13:35:22 +02:00
malbarral
f063e482d6 Using ng-show to show/hide dialog 2017-08-03 13:32:02 +02:00
Manuel Albarral
587dddf2cf Allow disable agents actions
Allow disable agents actions
2017-08-03 11:03:34 +02:00
malbarral
1d3cd06df5 Minor change 2017-08-03 11:01:10 +02:00
malbarral
f9683041b9 Allowing to disable agents actions 2017-08-03 10:43:02 +02:00
Manuel Albarral
919af49658 Update agentsPreview.js 2017-08-02 19:18:02 +02:00
Manuel Albarral
10f1a575a5 Merge pull request #25 from wazuh/loading-icon-17
Loading icon 17
2017-08-02 19:15:17 +02:00
malbarral
a68b80e4cb Merge branch '2.1' of github.com:wazuh/wazuh-kibana-app-dev into loading-icon-17
Conflicts:
	public/controllers/agentsPreview.js
	public/directives/kibanaVisualizationDirective.js
	public/less/main.less
	public/objects/genericReq.js
	public/objects/testConnection.js
	public/templates/agents-audit.html
	public/templates/agents-fim.html
	public/templates/agents-oscap.html
	public/templates/agents-overview.html
	public/templates/agents-pci.html
	public/templates/agents-pm.html
	public/templates/overview-audit.html
	public/templates/overview-fim.html
	public/templates/overview-general.html
	public/templates/overview-oscap.html
	public/templates/overview-pci.html
	public/templates/overview-pm.html
2017-08-02 19:05:11 +02:00
Manuel Albarral
d8bcc8e112 Merge pull request #50 from wazuh/adding-os-version-49
Adding OS version to agents filter
2017-08-02 18:41:11 +02:00
malbarral
91f3cf8cc8 Merge branch '2.1' of github.com:wazuh/wazuh-kibana-app-dev into adding-os-version-49
Conflicts:
	public/controllers/agentsPreview.js
2017-08-02 18:40:31 +02:00
Manuel Albarral
b5900c56ca Merge pull request #63 from wazuh/restarting-agents-preview-62
Restarting agents preview
2017-08-02 18:33:54 +02:00
malbarral
58849e30c3 Merge branch '2.1' of github.com:wazuh/wazuh-kibana-app-dev into restarting-agents-preview-62
Conflicts:
	package.json
	public/controllers/agentsPreview.js
	public/templates/agents-preview.html
2017-08-02 18:31:40 +02:00
Manuel Albarral
021cdd4fa9 Merge pull request #52 from wazuh/deleting-agents-preview-51
Deleting agents preview
2017-08-02 17:53:21 +02:00