Skip to content

Commit 8330f12

Browse files
mjabascal10mjabascal10
committed
Merge remote-tracking branch 'origin/release/v11.2.0' into release/v11.2.0
2 parents f3a1ff0 + efca0f2 commit 8330f12

29 files changed

Lines changed: 605 additions & 247 deletions

‎.github/workflows/v11-deployment-pipeline.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,7 @@ jobs:
241241
cd ${{ github.workspace }}/plugins/stats; go build -o com.utmstack.stats.plugin -v .
242242
cd ${{ github.workspace }}/plugins/soc-ai; go build -o com.utmstack.soc-ai.plugin -v .
243243
cd ${{ github.workspace }}/plugins/modules-config; go build -o com.utmstack.modules-config.plugin -v .
244+
cd ${{ github.workspace }}/plugins/crowdStrike; go build -o com.utmstack.crowdstrike.plugin -v .
244245
245246
- name: Prepare Dependencies for Event Processor Image
246247
run: |

‎event_processor.Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ COPY ./plugins/sophos/com.utmstack.sophos.plugin /workdir/plugins/utmstack/
1717
COPY ./plugins/stats/com.utmstack.stats.plugin /workdir/plugins/utmstack/
1818
COPY ./plugins/soc-ai/com.utmstack.soc-ai.plugin /workdir/plugins/utmstack/
1919
COPY ./plugins/modules-config/com.utmstack.modules-config.plugin /workdir/plugins/utmstack/
20+
COPY ./plugins/crowdStrike/com.utmstack.crowdstrike.plugin /workdir/plugins/utmstack/

‎frontend/src/app/app-management/app-logs/app-logs.component.html‎

Lines changed: 71 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ <h6 class="card-title mb-0 text-uppercase label-header">
44
Application logs
55
</h6>
66
<div class="d-flex justify-content-center align-items-center">
7-
<!--<ng-select (change)="filterBySelect($event,'source')"
7+
<ng-select (change)="filterBySelect($event,'source')"
88
[clearable]="true"
99
[items]="sources"
1010
[searchable]="false"
1111
class="has-minimum-width mr-3"
1212
placeholder="Source"
1313
style="min-width: 100px"
14-
></ng-select>-->
15-
<ng-select (change)="filterBySelect($event,'log.severity')"
14+
></ng-select>
15+
<ng-select (change)="filterBySelect($event,'type')"
1616
[clearable]="true"
1717
[items]="types"
1818
[searchable]="false"
@@ -28,78 +28,78 @@ <h6 class="card-title mb-0 text-uppercase label-header">
2828
</app-elastic-filter-time>
2929
</div>
3030
</div>
31-
<div class="table-responsive resizable-table-responsive m-h-0">
32-
<table class="table text-nowrap">
33-
<thead>
34-
<tr>
35-
<th class="font-weight-semibold text-uppercase cursor-pointer w-25">
36-
Date&nbsp;
37-
</th>
38-
<th class="font-weight-semibold text-uppercase cursor-pointer w-25">
39-
Source&nbsp;
40-
</th>
41-
<th class="font-weight-semibold text-uppercase cursor-pointer w-25">
42-
Type&nbsp;
43-
</th>
44-
<th class="font-weight-semibold text-uppercase cursor-pointer w-25">
45-
Preview&nbsp;
46-
</th>
47-
</tr>
48-
</thead>
49-
<tbody *ngIf="logs && !loading">
50-
<tr (click)="message = log.log.msg" *ngFor="let log of logs" class="cursor-pointer">
51-
<td><span>{{log["@timestamp"]| date:'medium':'UTC'}}</span></td>
52-
<td>
53-
<span>{{'PANEL ( '+ log.dataSource + ' )'}}</span>
54-
</td>
55-
<td>
56-
<span [ngClass]="getClassByType(log.log.severity)"
31+
<div class="table-responsive resizable-table-responsive m-h-0">
32+
<table class="table text-nowrap">
33+
<thead>
34+
<tr>
35+
<th class="font-weight-semibold text-uppercase cursor-pointer w-25">
36+
Date&nbsp;
37+
</th>
38+
<th class="font-weight-semibold text-uppercase cursor-pointer w-25">
39+
Source&nbsp;
40+
</th>
41+
<th class="font-weight-semibold text-uppercase cursor-pointer w-25">
42+
Type&nbsp;
43+
</th>
44+
<th class="font-weight-semibold text-uppercase cursor-pointer w-25">
45+
Preview&nbsp;
46+
</th>
47+
</tr>
48+
</thead>
49+
<tbody *ngIf="logs && !loading">
50+
<tr (click)="message = log.message" *ngFor="let log of logs" class="cursor-pointer">
51+
<td><span>{{log["@timestamp"]| date:'medium':'UTC'}}</span></td>
52+
<td>
53+
<span>{{log.source}}</span>
54+
</td>
55+
<td>
56+
<span [ngClass]="getClassByType(log.type)"
5757
class="p-1 border-1 rounded">
58-
{{log.log.severity}}
58+
{{log.type}}
5959
</span>
60-
</td>
61-
<td>
62-
<span [ngClass]="getClassByType(log.log.msg)">
63-
{{getPreview(log.log.msg)}}
60+
</td>
61+
<td>
62+
<span [ngClass]="getClassByType(log.type)">
63+
{{getPreview(log.message)}}
6464
</span>
65-
</td>
66-
</tr>
67-
</tbody>
68-
<tbody *ngIf="(logs.length===0 && !loading)">
69-
<tr>
70-
<td colspan="5">
71-
<app-no-data-found></app-no-data-found>
72-
</td>
73-
</tr>
74-
</tbody>
75-
<tbody *ngIf="loading">
76-
<tr>
77-
<td colspan="5">
78-
<div class="p-5 d-flex justify-content-center align-items-center text-blue-800">
79-
<app-utm-spinner [height]="'35px'"
80-
[label]="'Loading logs'"
81-
[loading]="loading"
82-
[width]="'35px'">
83-
</app-utm-spinner>
84-
</div>
85-
</td>
86-
</tr>
87-
</tbody>
88-
</table>
89-
</div>
90-
<div *ngIf="logs && logs.length>0" class="py-3">
91-
<div class="row justify-content-center">
92-
<ngb-pagination
93-
(pageChange)="loadPage($event)"
94-
[(page)]="page"
95-
[boundaryLinks]="true"
96-
[collectionSize]="totalItems"
97-
[maxSize]="5"
98-
[pageSize]="itemsPerPage"
99-
[rotate]="true"
100-
[size]="'sm'"></ngb-pagination>
101-
</div>
65+
</td>
66+
</tr>
67+
</tbody>
68+
<tbody *ngIf="(logs.length===0 && !loading)">
69+
<tr>
70+
<td colspan="5">
71+
<app-no-data-found></app-no-data-found>
72+
</td>
73+
</tr>
74+
</tbody>
75+
<tbody *ngIf="loading">
76+
<tr>
77+
<td colspan="5">
78+
<div class="p-5 d-flex justify-content-center align-items-center text-blue-800">
79+
<app-utm-spinner [height]="'35px'"
80+
[label]="'Loading logs'"
81+
[loading]="loading"
82+
[width]="'35px'">
83+
</app-utm-spinner>
84+
</div>
85+
</td>
86+
</tr>
87+
</tbody>
88+
</table>
89+
</div>
90+
<div *ngIf="logs && logs.length>0" class="py-3">
91+
<div class="row justify-content-center">
92+
<ngb-pagination
93+
(pageChange)="loadPage($event)"
94+
[(page)]="page"
95+
[boundaryLinks]="true"
96+
[collectionSize]="totalItems"
97+
[maxSize]="5"
98+
[pageSize]="itemsPerPage"
99+
[rotate]="true"
100+
[size]="'sm'"></ngb-pagination>
102101
</div>
102+
</div>
103103
</div>
104104

105105
<div *ngIf="message" class="utm-right-container">

‎frontend/src/app/app-management/app-logs/app-logs.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ export class AppLogsComponent implements OnInit {
2727
req: { filters: ElasticFilterType[], index: string, top: number } = {
2828
filters: [
2929
{field: '@timestamp', operator: ElasticOperatorsEnum.IS_BETWEEN, value: ['now-7d', 'now']},
30-
{field: 'log.containerName.keyword', operator: ElasticOperatorsEnum.IS, value: 'utmstack_backend'}
31-
], index: 'v11-log-utmstack-*', top: 100000
30+
], index: 'v11-backend-logs', top: 100000
3231
};
3332
sources = ['PANEL', 'AGENT'];
3433
types = ['ERROR', 'WARNING', 'INFO'];
@@ -58,6 +57,7 @@ export class AppLogsComponent implements OnInit {
5857
private onSuccess(data, headers) {
5958
this.totalItems = headers.get('X-Total-Count');
6059
this.logs = data || [];
60+
console.log('Logs loaded:', this.logs);
6161
this.loading = false;
6262
}
6363

‎frontend/src/app/app-module/app-module-view/app-module-view.component.html‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ <h5 class="card-title label-header mb-0 text-uppercase label-header">
2828
(showModuleIntegration)="showModule($event)"
2929
class="module-card m-1">
3030
</app-app-module-card>
31-
<app-utm-spinner class="position-absolute top-35 right-50" [height]="'110px'" [loading]="(moduleResolver.loading$ | async)" [width]="'110px'"
31+
<app-utm-spinner class="position-absolute top-35 right-50"
32+
[height]="'110px'"
33+
[loading]="(moduleResolver.loading$ | async)" [width]="'110px'"
3234
label="Loading modules">
3335
</app-utm-spinner>
3436
</div>

‎frontend/src/app/app-module/app-module.module.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ import {ModuleIntegrationComponent} from './module-integration/module-integratio
6363
import {ModuleService} from './services/module.service';
6464
import {AppModuleSharedModule} from './shared/app-module-shared.module';
6565
import {GuideUtmstackComponent} from "./guides/guide-utmstack/guide-utmstack.component";
66+
import {GuideCrowdstrikeComponent} from "./guides/guide-crowdstrike/guide-crowdstrike.component";
6667

6768

6869
@NgModule({
@@ -121,7 +122,8 @@ import {GuideUtmstackComponent} from "./guides/guide-utmstack/guide-utmstack.com
121122
InstallLogCollectorComponent,
122123
AgentInstallSelectorComponent,
123124
OracleComponent,
124-
GuideUtmstackComponent
125+
GuideUtmstackComponent,
126+
GuideCrowdstrikeComponent
125127
],
126128
imports: [
127129
CommonModule,

‎frontend/src/app/app-module/conf/int-generic-group-config/int-generic-group-config.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
<label [for]="'sectionParam'+integrationConfig.id" class="pb-1 span-small-icon d-flex justify-content-between align-items-center">
8888
<span>
8989
<i [ngbTooltip]="'This param is required'"
90-
[ngClass]="!checkConfigValue(integrationConfig.confValue)?'text-danger':'text-success'"
90+
[ngClass]="integrationConfig.confRequired && !checkConfigValue(integrationConfig.confValue) ? 'text-danger' : 'text-success'"
9191
class="icon-circle2 mr-1"
9292
placement="auto"></i>
9393
{{integrationConfig.confName}}
@@ -147,7 +147,7 @@
147147
</app-utm-file-upload>
148148

149149
<small
150-
*ngIf="integrationConfig.confValue === '' || integrationConfig.confValue === null || integrationConfig.confValue=== undefined"
150+
*ngIf="integrationConfig.confRequired && (integrationConfig.confValue === '' || integrationConfig.confValue === null || integrationConfig.confValue=== undefined)"
151151
class="text-danger">
152152
Param {{integrationConfig.confName}} is required
153153
</small>

‎frontend/src/app/app-module/guides/guide-crowdstrike/crowdstrike.steps.ts‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
import {COLLECTOR_MESSAGE, Step} from '../shared/step';
2+
3+
export const CROWDSTRIKE_STEPS: Step[] = [
4+
{
5+
id: '1',
6+
name: 'Navigate to the main view. Click the hamburger icon in the top‑left corner labeled "Open menu".' +
7+
'Select <b>Support and resources</b> then <b>API Clients and Keys</b>.',
8+
content: {
9+
id: 'stepContent1',
10+
images: [{
11+
alt: 'Open menu hamburger top-left',
12+
src: '../../../../assets/img/guides/crowdstrike/1.png',
13+
}]
14+
}
15+
},
16+
{
17+
id: '2',
18+
name: 'Create a new API client. Click <b>Create API Client</b>. ',
19+
content: {
20+
id: 'stepContent2',
21+
images: [{
22+
alt: 'Create API client form with name and scopes',
23+
src: '../../../../assets/img/guides/crowdstrike/2.png',
24+
}]
25+
}
26+
},
27+
{
28+
id: '3',
29+
name: 'Generate API credentials. Provide a descriptive client name (used to identify event sources) and select the API scopes required for Event Streams.' +
30+
'Click <b>Create</b> to generate the client credentials and endpoint information.',
31+
content: {
32+
id: 'stepContent3',
33+
images: [{
34+
alt: 'Create button to generate API credentials',
35+
src: '../../../../assets/img/guides/crowdstrike/3.png',
36+
}]
37+
}
38+
},
39+
{
40+
id: '4',
41+
name: 'Record the credentials securely. Note the <b>Client ID</b>, <b>Client Secret</b> and the <b>Base URL</b> for the selected region.',
42+
content: {
43+
id: 'stepContent4',
44+
images: [{
45+
alt: 'Screen showing Client ID Client Secret and Base URL',
46+
src: '../../../../assets/img/guides/crowdstrike/4.png',
47+
}]
48+
}
49+
},
50+
{
51+
id: '5',
52+
name: 'Insert information in the following inputs.You can add more than one CrowdStrike configuration by clicking on Add tenant button.',
53+
content: {
54+
id: 'stepContent5'
55+
}
56+
},
57+
{id: '6', name: 'Click on the button shown below, to activate the UTMStack features related to this integration',
58+
content: {
59+
id: 'stepContent6'
60+
}
61+
}
62+
];

‎frontend/src/app/app-module/guides/guide-crowdstrike/guide-crowdstrike.component.css‎

Whitespace-only changes.

‎frontend/src/app/app-module/guides/guide-crowdstrike/guide-crowdstrike.component.html‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
<div class="w-100 h-100">
2+
<div class="card-header d-flex justify-content-between align-items-center">
3+
<h4 class="card-title mb-0 text-primary">
4+
CROWDSTRIKE FALCON INTEGRATION
5+
</h4>
6+
</div>
7+
8+
<div class="card-body">
9+
<ol class="setup_list">
10+
<app-utm-list [items]="steps">
11+
<ng-template stepTemplateRef let-step>
12+
<li>
13+
<app-step>
14+
<span stepNumber>{{step.id}}</span>
15+
<div [innerHtml]="step.name"></div>
16+
<ng-container *ngIf="step.content">
17+
18+
<ng-template [ngIf]="step.content['images']">
19+
<app-utm-list [items]="step.content['images']">
20+
<ng-template stepTemplateRef let-image>
21+
<img [alt]="image.alt" class="step-img" [src]="image.src">
22+
</ng-template>
23+
</app-utm-list>
24+
</ng-template>
25+
26+
<ng-template [ngIf]="step.content.id === 'stepContent5'">
27+
<app-int-generic-group-config [moduleId]="integrationId"
28+
(configValidChange)="configValidChange($event)"
29+
[serverId]="serverId"></app-int-generic-group-config>
30+
</ng-template>
31+
32+
<ng-template [ngIf]="step.content.id === 'stepContent6'">
33+
<div class="mt-3">
34+
<app-app-module-activate-button [module]="module.CROWDSTRIKE"
35+
[type]="'integration'"
36+
[disabled]="configValidity"
37+
[serverId]="serverId">
38+
</app-app-module-activate-button>
39+
</div>
40+
</ng-template>
41+
42+
</ng-container>
43+
</app-step>
44+
</li>
45+
</ng-template>
46+
</app-utm-list>
47+
</ol>
48+
</div>
49+
</div>
50+
51+

0 commit comments

Comments
 (0)