Commit Graph

317 Commits

Author SHA1 Message Date
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
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
e95c26b3b0 Merge branch '2.0' of github.com:wazuh/wazuh-kibana-app-dev into 2.1 2017-08-01 22:30:36 +02:00
malbarral
481c710ba9 Setting .load to true if there is an agent 2017-08-01 22:27:42 +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
malbarral
2e85732261 Waiting until the info is loaded 2017-07-31 16:19:16 +02:00
malbarral
359d87ceb1 Solving some issues 2017-07-27 18:24:50 +02:00
malbarral
4ddab90332 Merge branch 'master' of https://github.com/wazuh/wazuh-kibana-app-dev into 2.1 2017-07-25 18:00:25 +02:00
malbarral
022fd3e8bb Using wazuh-elastic instead of calling directly to Elasticsearch 2017-07-25 17:30:19 +02:00
Manuel Albarral
64ad3d9de4 Fixing some errors 2017-07-24 18:37:20 +02:00
malbarral
6e2ba047c8 Importing configuration from .kibana index and using .wazuh index 2017-07-22 11:45:58 +02:00
malbarral
97041d7c10 Merge branch '2.0' of https://github.com/wazuh/wazuh-kibana-app-dev into 2.1 2017-07-21 15:03:33 +02:00
Manuel Albarral
bada1325ed Searchbar and some styles fixed 2017-07-21 13:51:13 +02:00
malbarral
e96c156531 New functionality to add agents 2017-07-20 08:22:44 +02:00
malbarral
38292ae3fe Adding selector at the bottom and replacing some parameters 2017-07-18 18:04:09 +02:00
malbarral
b9a3a3b029 Deleting useless API request 2017-07-17 15:41:33 +02:00
malbarral
49d8139970 Using new API request 2017-07-17 15:37:08 +02:00
malbarral
f431562a16 Adding code to template and controller 2017-07-14 10:03:20 +02:00
malbarral
d2b50eb09e Merge branch 'master' of https://github.com/wazuh/wazuh-kibana-app-dev into 2.1
Conflicts:
	public/less/main.less
2017-07-12 12:32:36 +02:00
malbarral
6846b69a69 Fixing compatibility issues 2017-07-10 21:18:51 +02:00
Pedro Sanchez
efe0004cf9 Adding os version and os platorm columns to agents preview 2017-07-05 17:04:14 +02:00
malbarral
89ba62fa61 Changing styles to CSS and checking if os field exists 2017-07-05 13:01:07 +02:00
malbarral
b3c33bb1da Using instead of genericReq when needed 2017-07-05 11:09:27 +02:00
malbarral
24b1323ffd Adding os version and os platorm columns to agents preview 2017-07-05 10:07:10 +02:00
malbarral
596d11e65a Merge remote-tracking branch 'origin' into 2.1
Conflicts:
	server/wazuh-monitoring.js
2017-07-04 12:04:44 +02:00
Manuel
e70dab3421 Controlling 'undefined' case for '$route.current.params._g' 2017-06-20 09:43:40 +02:00
Manuel
95af1e11f1 Fixing typo 2017-06-06 12:59:03 +02:00
Jesus Linares
1b4b3be206 Merge branch '2.0' into 2.1
Conflicts:
	server/api/wazuh-api.js
2017-06-05 17:16:53 +00:00
Manuel
7adc1a3ca5 Getting URLs from browser session storage when it's necessary 2017-05-30 12:37:38 +02:00
Manuel
d74ffcddc1 Replacing $html requets by genericReq requests 2017-05-26 20:49:05 +02:00
Manuel
0f58368a90 Adding basepath where it's needed 2017-05-25 18:29:54 +02:00
Manuel
dd07aa8eb3 Blank spaces fixed 2017-05-24 19:22:51 +02:00
Manuel
fe46172d09 Reloading the API hostname when it has changed. 2017-05-24 19:15:55 +02:00
Manuel
519e9f2a93 Adding new os column for agents preview table 2017-05-22 17:37:57 +02:00
Pedro Sanchez
967245ba99 Syscheck and rootcheck time data after GetAgent request 2017-04-25 06:53:52 -07:00
Pedro Sanchez
ef439063b3 New agent info boxes. Syscheck/Rootcheck times 2017-04-25 05:29:44 -07:00
Pedro Sanchez
a128ca1019 Dashboard searchbar and dashboard list fix 2017-04-25 04:20:56 -07:00
Pedro Sanchez
05696f8509 Elasticsearch JS migrated to internal Kibana callWithRequest/callWithInternalUser 2017-03-31 10:34:08 -07:00
Pedro Sanchez
0d70f727e6 Fixes for 5.3.0 version 2017-03-29 00:34:48 -07:00
Pedro Sanchez
22140e9a38 Fix Dashboards URL for different 2017-03-08 05:09:13 -08:00
Pedro Sanchez
7cd1ed2f48 OpenSCAP panels fix. Error message at settings. Welcome message at Settings:about 2017-03-02 09:43:04 -08:00
Pedro Sanchez
a013e17130 Welcome message 2017-02-27 05:44:03 -08:00
Pedro Sanchez
e67cc0a82d Replaced mdToast for Kibana notify. Added Check API connection on Settings. Fixed _g wrong time filters 2017-02-24 05:29:29 -08:00
Pedro Sanchez
12ec30c092 Fetch agents on demand, when adding new manager. md-select css fixes. updated mapping 2017-02-23 04:53:18 -08:00
Pedro Sanchez
998b11635f Fix Agents preview searchfilter. Updated mapping/templates. Background color at preview 2017-02-16 08:53:19 -08:00
Pedro Sanchez
9c457a1658 SCAP cards overflow fix. FIM Top visualization margins fixed. Top 5 agents evolution: Size limit set to 5. Agents: fetchAgent obsolete, removed. Start position for Overview: OSCAP/PCI set to start. 2017-02-16 04:51:11 -08:00
Pedro Sanchez
63535783b6 Menu tab: Click and Fetch. Fixed wrong double request. Alerts count check by agent name. 2017-02-16 04:17:44 -08:00