Commit Graph

573 Commits

Author SHA1 Message Date
Jesús Ángel González
5dc6805021 Added missing function 2017-12-11 09:33:43 +01:00
Jesús Ángel González
bc76a1d651 New logic in order to handle a group from agents 2017-12-05 20:42:30 +01:00
Javier Castro
10fdb93f5e
Merge pull request #116 from wazuh/3.0-minor-enhacements-dev
Minor enhacements dev
2017-12-03 15:35:38 +01:00
havidarou
62bc6c1111 Enchancement: dynamic index-patterns, plus minor fixes 2017-12-03 09:30:47 -05:00
Jesús
9ac2e43078 Catching error in almost places where a promise is resolved 2017-12-01 18:28:48 +01:00
Jesús
26f09b8055 Rebuilt of the rules table 2017-11-30 16:29:45 +01:00
Jesús
5532508177 Added a function to handle opened/closed item on decoders list 2017-11-30 13:02:03 +01:00
havidarou
123e451354 Changing loading conditions for visualizations in the agents tab 2017-11-29 13:36:56 -05:00
havidarou
5e7f74094a Removing unnecesary watchers from the visualization directive 2017-11-29 10:06:13 -05:00
havidarou
4cfa0f4c2f Properly loading agent data for the general view 2017-11-29 06:25:34 -05:00
Javier Castro
085f4216dd
Merge branch '3.0' into 3.0-agents-refactor 2017-11-29 11:03:55 +01:00
havidarou
dbcaa43fad Filling agent information in the agents controller 2017-11-29 05:02:34 -05:00
Jesús
4bb049d881 Sending only the agent id to the rootScope 2017-11-29 10:55:47 +01:00
Jesús
645ced8ab0 Fix settings menu 2017-11-28 18:01:34 +01:00
Javier Castro
8482694f33
Merge branch '3.0' into 3.0-refactoring-agents-data-flow 2017-11-28 17:39:38 +01:00
havidarou
32c8f247a2 Imitating overview data flow in agents 2017-11-28 11:37:31 -05:00
Javier Castro
6729174cee
Merge pull request #102 from wazuh/3.0-agents-fix
Fix groups and agents preview
2017-11-28 17:32:26 +01:00
Jesús
99ec9ebdc2 New view, new route and new controller for agents preview 2017-11-28 17:30:03 +01:00
Jesús
6f37d87c1d Fix typo 2017-11-28 16:46:10 +01:00
Jesús
9ed68320bb Added new showAgent function in order to work with the new agents controller 2017-11-28 16:44:49 +01:00
Jesús
a5a3c129a9 Show only os platform 2017-11-28 16:03:44 +01:00
Javier Castro
abc2dd91d4
Merge pull request #100 from wazuh/3.0-miscellaneous
Several minor fixes
2017-11-28 14:54:04 +01:00
havidarou
31cb9c380c Several minor fixes 2017-11-28 08:52:25 -05:00
Jesús
7ae907b485 Ensure syscheck and rootcheck are showing properly 2017-11-28 10:48:07 +01:00
havidarou
20d433e9be Fixing some bugs due to prior merges and fixing one index pattern in the discover tabs 2017-11-27 15:54:57 -05:00
Javier Castro
6a56bc6f12
Merge branch '3.0' into 3.0-apply-agent-rewritten 2017-11-27 19:09:35 +01:00
Javier Castro
d3cd8d17bc
Merge pull request #93 from wazuh/3.0-loops-enhacements
Some loops enhacements
2017-11-27 19:08:18 +01:00
havidarou
68e714d8c5 Fixing filters in agents and some redirections 2017-11-27 13:00:12 -05:00
Jesús
d7befb45bf Fix sysCheck and rootCheck values and the function applyAgent was refactored 2017-11-27 18:47:04 +01:00
Jesús
5bac6ca416 Replaced angular.forEach by for..in loop 2017-11-27 18:07:31 +01:00
Jesús
746c56d38a Replaced angular.forEach by native for cached loop 2017-11-27 18:07:31 +01:00
Jesús
a00fbf962f Replaced angular.forEach by for..in loop 2017-11-27 18:07:31 +01:00
havidarou
dfdcc24fbc Adding the new discover to the agents tab 2017-11-27 11:27:07 -05:00
Javier Castro
5c9819b7e9
Merge pull request #87 from wazuh/3.0-enhacements-agents-preview
Enhacements in agents loading. Removed unneccessary extra api call
2017-11-27 12:18:27 +01:00
Javier Castro
b334be5037
Merge branch '3.0' into 3.0-parallellized-manager-status 2017-11-27 12:17:06 +01:00
Javier Castro
cad1bf5d5d
Merge pull request #84 from wazuh/3.0-fix-come-from-groups
Fix error when come from groups to agents
2017-11-27 12:14:58 +01:00
Javier Castro
1124b0e278
Merge pull request #83 from wazuh/3.0-ctrl-removed-unused
Eliminated unnecessary call to api and eliminated an unused variable
2017-11-27 12:14:22 +01:00
Javier Castro
627735319e
Merge branch '3.0' into 3.0-css-reordering-2 2017-11-27 12:12:39 +01:00
Javier Castro
1b1fe1367a
Merge pull request #88 from wazuh/3.0-new-discover-enhacements
New discover enhacements
2017-11-27 12:03:34 +01:00
havidarou
1a693e88b8 Bringing functionality to he table in discover plus removing its menu 2017-11-27 05:57:47 -05:00
Jesús
2ee5784750 Fix on mouse over from Wazuh logo 2017-11-27 11:18:24 +01:00
havidarou
8a551be8b1 Whole rebranding for the discover along the visualizations 2017-11-25 10:36:39 -05:00
Jesús
9c6579615b Enhacements in agents loading. Removed unneccessary extra api call 2017-11-24 17:19:06 +01:00
Jesús
b3fd6adf5b Replaced scope.apply by scope.digest (performance) 2017-11-24 16:55:12 +01:00
Jesús
d8f463a0e2 Parallellized manager status load 2017-11-24 14:51:54 +01:00
Jesús
c5a517c10f Added temporary variable to the $rootScope 2017-11-24 12:09:33 +01:00
Jesús
34ad83bae8 Fix $scope.tab if come from groups tab 2017-11-24 12:09:33 +01:00
Jesús
0d1d93b2c0 Eliminated unnecessary call to api and eliminated an unused variable 2017-11-24 10:17:22 +01:00
Juanjo Jiménez
f83d3e74d4 "Dashboard" tab deleted from app
There was some old files of a "Dashboard" tab. They were deleted from the app and also every other remaining references and links to the Dashboard templates.
2017-11-23 17:00:18 +01:00
havidarou
7a053f56a5 Enabling refresh in the agents tab (not properly yet though) 2017-11-20 13:20:27 -05:00
Javier Castro
dc6e501ba0
Merge branch '3.0-rebrand' into 3.0-dev-groups-filename-and-close-btn 2017-11-20 16:33:54 +01:00
Jesús
69d1ada545 Clear filename when new file is opening 2017-11-20 13:37:10 +01:00
Jesús
6a142a18a1 Getting filename in groups tab 2017-11-20 13:33:52 +01:00
havidarou
82ffb30e13 Fixing styles in manager-logs and manager-ruleset 2017-11-20 06:13:37 -05:00
Javier Castro
c3bc8428f4
Merge pull request #69 from wazuh/3.0-dev-top-menu-and-settings
Top menu and settings fixed
2017-11-17 21:29:26 +01:00
havidarou
40732ce4c0 Adjusting integrations - ruleset 2017-11-17 15:22:01 -05:00
Jesús
9c1c40ce12 Fix top menu selected tab 2017-11-17 18:31:48 +01:00
Javier Castro
6a42294637
Merge branch '3.0-rebrand' into 3.0-dev-ruleset-visualizations 2017-11-17 17:04:02 +01:00
havidarou
3ceac6ca48 Enabling implicit filters on agents 2017-11-17 11:01:16 -05:00
Jesús
7a57ca57f2 Replaced visualizations in overview-ruleset tab 2017-11-17 13:14:23 +01:00
Javier Castro
01cc8e1f1a
Merge pull request #65 from wazuh/3.0-dev-main-menu
Main menu style modified
2017-11-17 10:23:59 +01:00
havidarou
d2e4e4482f Adapting views to the new integrations - overview tab 2017-11-17 04:14:39 -05:00
Jesús
a9a6d13c04 Main menu style modified 2017-11-17 10:07:27 +01:00
havidarou
2ff500aa6f Fixing backend call for no-base-path 2017-11-17 03:56:59 -05:00
havidarou
1c6e36cc9f Temporarily disabling one visualization in overview-general 2017-11-14 18:34:49 -05:00
havidarou
a6690c9874 Beginning integrations transition in html 2017-11-14 13:46:15 -05:00
Javier Castro
19e52f9f07
Merge pull request #61 from wazuh/3.0-dev-overview-fix
Removed unused appState $cookies
2017-11-13 17:34:26 +01:00
Jesús
04a84ca2ab Fix last agent on manager status tab 2017-11-13 13:34:32 +01:00
Jesús
6d7a6687e2 Removed unused appState $cookies 2017-11-13 12:50:34 +01:00
Jesús Ángel González Novez
2b036a3362 Fix wrong param in api request 2017-11-13 11:10:54 +01:00
Jesús Ángel González Novez
eca25dca8f Fix when-scroll on agents tab 2017-11-10 14:34:41 +01:00
Jesús Ángel González Novez
06ede5928e Last agent is now fine in agents tab 2017-11-10 13:08:59 +01:00
Jesús Ángel González Novez
39b8dd94e3 Colors array is now const and put on top of the controller 2017-11-10 11:21:33 +01:00
Jesús Ángel González Novez
2a4fcd0efb Removed some console.log for better performance 2017-11-10 10:30:49 +01:00
Jesús Ángel González Novez
ef037d5d1e Top menu is now a directive 2017-11-10 10:29:40 +01:00
Javier Castro
86d092e6b3
Merge pull request #58 from wazuh/3.0-rebrand-fix-ruleset
Fix ruleset
2017-11-09 19:28:50 +01:00
Javier Castro
5b1f8ea461
Merge pull request #52 from jesusgn90/dev-agents-tab-unknown
Added "Unknown" platform to the agents tab.
2017-11-09 19:24:29 +01:00
Jesús Ángel González Novez
450c644c8a Ensure $rootScope.agent is the manager 2017-11-09 19:17:09 +01:00
Jesús Ángel González Novez
666c8ce66e Fix ruleset tab 2017-11-09 19:02:50 +01:00
Jesús Ángel González Novez
bbcb4fe24a Check for never connected agents, then add "Unknown" osPlatform 2017-11-08 16:00:58 +01:00
havidarou
aafe3ee01e Merge branch 'dev-factories-optimized' of https://github.com/jesusgn90/wazuh-kibana-app into 3.0-rebrand
Conflicts:
	public/controllers/common/factories.js
2017-11-08 07:17:15 -05:00
havidarou
1f4ff21295 Merge branch 'dev-factories-single-file' of https://github.com/jesusgn90/wazuh-kibana-app into jesusgn90-dev-factories-single-file
Conflicts:
	public/controllers/groups.js
2017-11-08 07:12:53 -05:00
havidarou
345254f3df Merge branch 'dev-json-beautifier' of https://github.com/jesusgn90/wazuh-kibana-app into jesusgn90-dev-json-beautifier
Conflicts:
	public/controllers/groups.js
	public/less/common.less
	public/templates/groups-preview.html
2017-11-08 07:06:44 -05:00
Javier Castro
eecb6a1e7f
Merge pull request #50 from jesusgn90/dev-fix-arconf-filename
Fix call when filename is ar.conf
2017-11-08 12:24:53 +01:00
Javier Castro
8a16f933c9
Merge pull request #48 from jesusgn90/dev-manager-log-controller
Properly handling of promises. Removed redundant variables
2017-11-08 12:22:33 +01:00
Jesús Ángel González Novez
b16015bfd3 Optimized factories that are using data handler service 2017-11-08 09:35:56 +01:00
Jesús Ángel González Novez
e63e9d2c23 All factories are now in a single file. Directives and filters are too in an single file 2017-11-07 15:37:13 +01:00
Jesús Ángel González Novez
91614ec9b3 Better beautifier in JSON output 2017-11-07 15:17:43 +01:00
Jesús Ángel González Novez
91ec639d6a Added "Unknown" platform to the agents tab. Now you can filter agents without os 2017-11-07 09:55:04 +01:00
Jesús Ángel González Novez
7279586bca Fix ar.conf filename 2017-11-06 16:52:37 +01:00
Jesús Ángel González Novez
f381bd800f Properly handling of promises. Removed redundant variables 2017-11-06 10:56:08 +01:00
Jesús Ángel González Novez
f258d50750 Fix go to agents view from groups. Fix onDestroy wrong call on groups 2017-11-03 13:33:37 +01:00
Jesús Ángel González Novez
76e9dd6ed3 Extracted prepError function to single file 2017-11-02 10:22:46 +01:00
Jesús Ángel González Novez
e544f21dd6 Fix select dropdown used to filter agents by OS platform. 2017-11-02 10:22:15 +01:00
Jesús Ángel González Novez
7021575899 Added missing variable 2017-11-02 09:12:53 +01:00
Jesús Ángel González Novez
7ceea533b6 Added two search terms more to groups controller. Added search field for both agents and files. 2017-10-31 17:42:42 +01:00
Jesús Ángel González Novez
e505236072 Fix groups tab. Replaced variable names. Changed styled. Close opened file when group is changed. 2017-10-31 16:16:47 +01:00
Jesús Ángel González Novez
187f066aae Added travis config file. Replaced == by === multiple files. 2017-10-30 11:52:54 +01:00
Jesús Ángel González Novez
9622f50ec5 Using template literals. Removed redundant quotes. Minor improvements 2017-10-30 11:22:01 +01:00
Jesús Ángel González Novez
7dafea5b5c Minor improvements in controllers 2017-10-30 10:08:42 +01:00
Jesús Ángel González Novez
201064bdf5 Properly handled multiple promises array. 2017-10-30 09:42:03 +01:00
Jesús Ángel González Novez
f9806c8bfc Minor refactor in overview and ruleset 2017-10-27 14:26:49 +02:00
Jesús Ángel González Novez
829c791955 Optimized settings file 2017-10-27 14:20:16 +02:00
Jesús Ángel González Novez
13730cf5f1 Fixed some service, factory and controller declarations 2017-10-27 13:39:25 +02:00
Jesús Ángel González Novez
946b7a5ebd Improvements in front-end controllers 2017-10-27 12:48:35 +02:00
havidarou
60782224ec Fixing extensions loading and metric visualization height 2017-10-25 01:19:46 -04:00
havidarou
33b9a918c9 Missing overview.js rebrand 2017-10-24 12:07:13 -04:00
havidarou
f6e76c5a29 Rebranding controllers 2017-10-20 15:04:22 -04:00
malbarral
38150dc4f6 Fixing addition of APIs. In progress 2017-10-10 17:09:50 +02:00
malbarral
010a66d846 Fixing visualization in Manager - Decoder 2017-10-10 12:32:03 +02:00
malbarral
7fd4b26217 Using new visualization directive 2017-10-09 17:49:10 +02:00
malbarral
df3482958e Fixing Agents tabs 2017-10-09 12:26:12 +02:00
malbarral
31ceed3b73 Fixing Agent tabs. In progress 2017-10-06 17:40:02 +02:00
malbarral
4a0386424a Fixing Overview tabs 2017-10-06 13:04:15 +02:00
malbarral
d6e7424c04 Fixing Manager tab 2017-10-04 17:24:56 -07:00
malbarral
1d24083a9f Fixing Settings tab 2017-10-04 17:24:56 -07:00
havidarou
ba40ba8162 Fixing service and removing unnecessary code in the initialization 2017-10-04 17:24:56 -07:00
malbarral
d8fcbcaa85 Fixing hidden and double searchbar 2017-09-07 18:10:09 +02:00
Pedro Sanchez
19dd364d01 Fix presentData payload agent field 2017-08-22 16:36:00 +00:00
Pedro Sanchez
0ba8f2d72d Binding Agent to rootScope 2017-08-21 07:11:05 +00:00
Pedro S
6a062b8d3f Merge cluster settings in 3.0 branch 2017-08-20 20:00:22 -07:00
havidarou
fd939fac06 Fixing last scan data retrieval for syscheck and rootcheck.
Conflicts:
	public/controllers/agents.js
2017-08-17 06:07:27 -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
havidarou
163e187b5a Fixing last scan data retrieval for syscheck and rootcheck. 2017-08-16 10:14:06 -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
Manuel Albarral
5603a024ec Adding cluster in API settings 2017-08-11 20:39: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
malbarral
6e92b63aa3 Formatting OS info in manager and agent tabs 2017-08-10 16:34:37 +02:00
malbarral
f063e482d6 Using ng-show to show/hide dialog 2017-08-03 13:32:02 +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
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
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
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
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