Commit Graph

773 Commits

Author SHA1 Message Date
malbarral
df6c872a05 Centering cards in agent tab 2017-08-10 14:27:07 +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
malbarral
c4e16906c9 Using material dialog 2017-08-02 17:49:23 +02:00
malbarral
4fd3c06563 Merge branch '2.1' of github.com:wazuh/wazuh-kibana-app-dev into deleting-agents-preview-51
Conflicts:
	public/controllers/agentsPreview.js
	public/less/main.less
2017-08-02 17:13:32 +02:00
Manuel Albarral
eb14d45a9e Merge pull request #69 from wazuh/adding-new-agent-53
Adding new agent
2017-08-02 16:56:47 +02:00
malbarral
29bd947ef3 Deleting unused styles 2017-08-02 16:55:32 +02:00
malbarral
ad8d510f3f Minor changes 2017-08-02 16:52:42 +02:00
malbarral
ae57b1b68c Merge branch '2.1' of github.com:wazuh/wazuh-kibana-app-dev into adding-new-agent-53
Conflicts:
	package.json
	public/less/main.less
	public/objects/genericReq.js
2017-08-02 16:48:18 +02:00
malbarral
b7bd1f7172 Using material design 2017-08-02 16:45:53 +02:00
malbarral
f78ce47a1b Merge branch 'master' of github.com:wazuh/wazuh-kibana-app into 2.1 2017-08-01 22:36:50 +02:00
malbarral
ae476780ab Merge branch '2.0' of github.com:wazuh/wazuh-kibana-app 2017-08-01 22:36:23 +02:00
malbarral
86b145c29d Setting $scope.load to true when an agent is present
Conflicts:
	README.md
2017-08-01 22:34:29 +02:00
malbarral
e95c26b3b0 Merge branch '2.0' of github.com:wazuh/wazuh-kibana-app-dev into 2.1 2017-08-01 22:30:36 +02:00
Manuel Albarral
87935a5b8a Merge pull request #68 from wazuh/wrong-agent-info-65
Setting .load to true if there is an agent
2017-08-01 22:29:21 +02:00
malbarral
481c710ba9 Setting .load to true if there is an agent 2017-08-01 22:27:42 +02:00
malbarral
8544bae811 Merge branch '2.0' of https://github.com/wazuh/wazuh-kibana-app into 2.1
Conflicts:
	README.md
2017-08-01 21:04:44 +02:00
malbarral
732bd662a5 Merge branch '2.0' of https://github.com/wazuh/wazuh-kibana-app
Conflicts:
	README.md
2017-08-01 21:03:29 +02:00
malbarral
0c44dfcd8a Waiting until the info is loaded
Conflicts:
	README.md
2017-08-01 20:59:06 +02:00
Manuel Albarral
053871670a Merge pull request #66 from wazuh/wrong-agent-info-65
Waiting until the info is loaded
2017-08-01 20:58:32 +02:00
malbarral
9f2667aa3b Merge branch '2.0' of github.com:wazuh/wazuh-kibana-app-dev into 2.1 2017-08-01 20:35:14 +02:00
Manuel Albarral
5730901bdf Merge pull request #67 from wazuh/fixing-styles-64
Fixing styles
2017-08-01 20:44:21 +02:00
malbarral
b5fb4840e3 Merge branch '2.0' of github.com:wazuh/wazuh-kibana-app-dev
Conflicts:
	README.md
2017-08-01 20:32:31 +02:00
malbarral
bd9ed40f7c Merge branch '2.0' of github.com:wazuh/wazuh-kibana-app-dev into fixing-styles-64
Conflicts:
	README.md
2017-08-01 20:00:41 +02:00
malbarral
3c91c6f68b Fixing Discover sidebar styles 2017-08-01 19:29:11 +02:00
malbarral
394e63c86d Making bigger some FIM boxes 2017-08-01 18:16:39 +02:00
malbarral
f6e79633e8 Using ellipsis when text is too long in cards 2017-08-01 18:09:20 +02:00
malbarral
9044ab6e1b Adding _source to meta fields to get formatted the JSON in Discover 2017-08-01 15:42:02 +02:00