Skip to content

Commit ae52a2a

Browse files
mjabascal10mjabascal10
committed
Merge remote-tracking branch 'origin/v11' into release/v11.2.2
2 parents e0009e1 + ff90ff6 commit ae52a2a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+209
-307
lines changed

‎.github/scripts/golang-updater/golang-updater‎

-3.16 MB
Binary file not shown.

‎.github/workflows/codeql.yml‎

Lines changed: 0 additions & 98 deletions
This file was deleted.

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

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,36 @@ jobs:
3232
# ===================
3333
# Triggered by: prerelease creation
3434
elif ${{ github.event_name == 'release' && github.event.action == 'prereleased' }}; then
35+
TAG="${{ github.event.release.tag_name }}"
36+
37+
# Skip if tag doesn't start with v10 (this pipeline is for v10 only)
38+
if [[ ! "$TAG" =~ ^v10\. ]]; then
39+
echo "⏭️ Skipping: Tag '$TAG' is not a v10 release. This pipeline handles v10 releases only."
40+
exit 0
41+
fi
42+
3543
echo "RC environment"
3644
echo "tag=v10-rc" >> $GITHUB_OUTPUT
3745
echo "environment=rc" >> $GITHUB_OUTPUT
38-
echo "release_tag=${{ github.event.release.tag_name }}" >> $GITHUB_OUTPUT
46+
echo "release_tag=$TAG" >> $GITHUB_OUTPUT
3947
4048
# ===================
4149
# PROD Environment
4250
# ===================
4351
# Triggered by: prerelease promoted to release
4452
elif ${{ github.event_name == 'release' && github.event.action == 'released' }}; then
53+
TAG="${{ github.event.release.tag_name }}"
54+
55+
# Skip if tag doesn't start with v10 (this pipeline is for v10 only)
56+
if [[ ! "$TAG" =~ ^v10\. ]]; then
57+
echo "⏭️ Skipping: Tag '$TAG' is not a v10 release. This pipeline handles v10 releases only."
58+
exit 0
59+
fi
60+
4561
echo "PROD environment"
4662
echo "tag=v10" >> $GITHUB_OUTPUT
4763
echo "environment=prod" >> $GITHUB_OUTPUT
48-
echo "release_tag=${{ github.event.release.tag_name }}" >> $GITHUB_OUTPUT
64+
echo "release_tag=$TAG" >> $GITHUB_OUTPUT
4965
fi
5066
5167
validations:

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

Lines changed: 14 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,12 @@ jobs:
7979
TAG="${{ github.event.release.tag_name }}"
8080
echo "Tag from prerelease: $TAG"
8181
82+
# Skip if tag doesn't start with v11 (this pipeline is for v11 only)
83+
if [[ ! "$TAG" =~ ^v11\. ]]; then
84+
echo "⏭️ Skipping: Tag '$TAG' is not a v11 release. This pipeline handles v11 releases only."
85+
exit 0
86+
fi
87+
8288
echo "tag=$TAG" >> $GITHUB_OUTPUT
8389
echo "environment=$ENVIRONMENT" >> $GITHUB_OUTPUT
8490
echo "cm_url=$CM_URL" >> $GITHUB_OUTPUT
@@ -115,32 +121,10 @@ jobs:
115121
fi
116122
fi
117123
118-
check_go_dependencies:
119-
name: Check Go Dependencies
120-
runs-on: ubuntu-24.04
121-
needs: [validations, setup_deployment]
122-
if: ${{ needs.setup_deployment.outputs.environment == 'rc' }}
123-
steps:
124-
- name: Check out code
125-
uses: actions/checkout@v4
126-
127-
- name: Set up Go
128-
uses: actions/setup-go@v5
129-
with:
130-
go-version: ^1.20
131-
132-
- name: Configure git for private modules
133-
run: |
134-
git config --global url."https://${{ secrets.API_SECRET }}:x-oauth-basic@github.com/".insteadOf "https://github.com/"
135-
echo "GOPRIVATE=github.com/utmstack" >> $GITHUB_ENV
136-
137-
- name: Check for outdated dependencies
138-
run: ${{ github.workspace }}/.github/scripts/golang-updater/golang-updater --check --discover
139-
140124
build_agent:
141125
name: Build and Sign Agent
142-
needs: [check_go_dependencies, setup_deployment]
143-
if: ${{ always() && (needs.check_go_dependencies.result == 'success' || needs.check_go_dependencies.result == 'skipped') && needs.setup_deployment.outputs.tag != '' }}
126+
needs: [setup_deployment]
127+
if: ${{ needs.setup_deployment.outputs.tag != '' }}
144128
runs-on: utmstack-signer
145129
steps:
146130
- name: Check out code into the right branch
@@ -204,8 +188,8 @@ jobs:
204188

205189
build_utmstack_collector:
206190
name: Build UTMStack Collector
207-
needs: [check_go_dependencies, setup_deployment]
208-
if: ${{ always() && (needs.check_go_dependencies.result == 'success' || needs.check_go_dependencies.result == 'skipped') && needs.setup_deployment.outputs.tag != '' }}
191+
needs: [setup_deployment]
192+
if: ${{ needs.setup_deployment.outputs.tag != '' }}
209193
runs-on: ubuntu-24.04
210194
steps:
211195
- name: Check out code into the right branch
@@ -288,8 +272,8 @@ jobs:
288272

289273
build_event_processor:
290274
name: Build Event Processor Microservice
291-
needs: [check_go_dependencies, setup_deployment]
292-
if: ${{ always() && (needs.check_go_dependencies.result == 'success' || needs.check_go_dependencies.result == 'skipped') && needs.setup_deployment.outputs.tag != '' }}
275+
needs: [setup_deployment]
276+
if: ${{ needs.setup_deployment.outputs.tag != '' }}
293277
runs-on: ubuntu-24.04
294278
steps:
295279
- name: Check out code into the right branch
@@ -314,8 +298,8 @@ jobs:
314298
cd ${{ github.workspace }}/plugins/stats; go build -o com.utmstack.stats.plugin -v .
315299
cd ${{ github.workspace }}/plugins/soc-ai; go build -o com.utmstack.soc-ai.plugin -v .
316300
cd ${{ github.workspace }}/plugins/modules-config; go build -o com.utmstack.modules-config.plugin -v .
317-
cd ${{ github.workspace }}/plugins/crowdStrike; go build -o com.utmstack.crowdstrike.plugin -v .
318-
cd ${{ github.workspace }}/plugins/threadwinds-ingestion; go build -o com.utmstack.threadwinds-ingestion.plugin -v .
301+
cd ${{ github.workspace }}/plugins/crowdstrike; go build -o com.utmstack.crowdstrike.plugin -v .
302+
cd ${{ github.workspace }}/plugins/feeds; go build -o com.utmstack.feeds.plugin -v .
319303
320304
- name: Prepare Dependencies for Event Processor Image
321305
run: |

‎agent-manager/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,5 @@ require (
5353
golang.org/x/sync v0.19.0 // indirect
5454
golang.org/x/sys v0.40.0 // indirect
5555
golang.org/x/text v0.33.0 // indirect
56-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260114163908-3f89685c29c3 // indirect
56+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260120221211-b8f7ae30c516 // indirect
5757
)

‎agent-manager/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@ golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE=
126126
golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8=
127127
gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
128128
gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
129-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260114163908-3f89685c29c3 h1:C4WAdL+FbjnGlpp2S+HMVhBeCq2Lcib4xZqfPNF6OoQ=
130-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260114163908-3f89685c29c3/go.mod h1:j9x/tPzZkyxcgEFkiKEEGxfvyumM01BEtsW8xzOahRQ=
129+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260120221211-b8f7ae30c516 h1:sNrWoksmOyF5bvJUcnmbeAmQi8baNhqg5IWaI3llQqU=
130+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260120221211-b8f7ae30c516/go.mod h1:j9x/tPzZkyxcgEFkiKEEGxfvyumM01BEtsW8xzOahRQ=
131131
google.golang.org/grpc v1.78.0 h1:K1XZG/yGDJnzMdd/uZHAkVqJE+xIDOcmdSFZkBUicNc=
132132
google.golang.org/grpc v1.78.0/go.mod h1:I47qjTo4OKbMkjA/aOOwxDIiPSBofUtQUI5EfpWvW7U=
133133
google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=

‎agent/go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,14 @@ require (
6666
golang.org/x/exp v0.0.0-20260112195511-716be5621a96 // indirect
6767
golang.org/x/net v0.49.0 // indirect
6868
golang.org/x/text v0.33.0 // indirect
69-
google.golang.org/genproto/googleapis/api v0.0.0-20260114163908-3f89685c29c3 // indirect
70-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260114163908-3f89685c29c3 // indirect
69+
google.golang.org/genproto/googleapis/api v0.0.0-20260120221211-b8f7ae30c516 // indirect
70+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260120221211-b8f7ae30c516 // indirect
7171
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
7272
gopkg.in/yaml.v3 v3.0.1 // indirect
7373
howett.net/plist v1.0.1 // indirect
7474
modernc.org/libc v1.67.6 // indirect
7575
modernc.org/mathutil v1.7.1 // indirect
7676
modernc.org/memory v1.11.0 // indirect
77-
modernc.org/sqlite v1.44.2 // indirect
77+
modernc.org/sqlite v1.44.3 // indirect
7878
sigs.k8s.io/yaml v1.6.0 // indirect
7979
)

‎agent/go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,10 @@ golang.org/x/tools v0.41.0 h1:a9b8iMweWG+S0OBnlU36rzLp20z1Rp10w+IY2czHTQc=
180180
golang.org/x/tools v0.41.0/go.mod h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg=
181181
gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
182182
gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
183-
google.golang.org/genproto/googleapis/api v0.0.0-20260114163908-3f89685c29c3 h1:X9z6obt+cWRX8XjDVOn+SZWhWe5kZHm46TThU9j+jss=
184-
google.golang.org/genproto/googleapis/api v0.0.0-20260114163908-3f89685c29c3/go.mod h1:dd646eSK+Dk9kxVBl1nChEOhJPtMXriCcVb4x3o6J+E=
185-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260114163908-3f89685c29c3 h1:C4WAdL+FbjnGlpp2S+HMVhBeCq2Lcib4xZqfPNF6OoQ=
186-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260114163908-3f89685c29c3/go.mod h1:j9x/tPzZkyxcgEFkiKEEGxfvyumM01BEtsW8xzOahRQ=
183+
google.golang.org/genproto/googleapis/api v0.0.0-20260120221211-b8f7ae30c516 h1:vmC/ws+pLzWjj/gzApyoZuSVrDtF1aod4u/+bbj8hgM=
184+
google.golang.org/genproto/googleapis/api v0.0.0-20260120221211-b8f7ae30c516/go.mod h1:p3MLuOwURrGBRoEyFHBT3GjUwaCQVKeNqqWxlcISGdw=
185+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260120221211-b8f7ae30c516 h1:sNrWoksmOyF5bvJUcnmbeAmQi8baNhqg5IWaI3llQqU=
186+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260120221211-b8f7ae30c516/go.mod h1:j9x/tPzZkyxcgEFkiKEEGxfvyumM01BEtsW8xzOahRQ=
187187
google.golang.org/grpc v1.78.0 h1:K1XZG/yGDJnzMdd/uZHAkVqJE+xIDOcmdSFZkBUicNc=
188188
google.golang.org/grpc v1.78.0/go.mod h1:I47qjTo4OKbMkjA/aOOwxDIiPSBofUtQUI5EfpWvW7U=
189189
google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
@@ -225,8 +225,8 @@ modernc.org/opt v0.1.4 h1:2kNGMRiUjrp4LcaPuLY2PzUfqM/w9N23quVwhKt5Qm8=
225225
modernc.org/opt v0.1.4/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns=
226226
modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w=
227227
modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE=
228-
modernc.org/sqlite v1.44.2 h1:EdYqXeBpKFJjg8QYnw6E71MpANkoxyuYi+g68ugOL8g=
229-
modernc.org/sqlite v1.44.2/go.mod h1:CzbrU2lSB1DKUusvwGz7rqEKIq+NUd8GWuBBZDs9/nA=
228+
modernc.org/sqlite v1.44.3 h1:+39JvV/HWMcYslAwRxHb8067w+2zowvFOUrOWIy9PjY=
229+
modernc.org/sqlite v1.44.3/go.mod h1:CzbrU2lSB1DKUusvwGz7rqEKIq+NUd8GWuBBZDs9/nA=
230230
modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0=
231231
modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A=
232232
modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=

‎event_processor.Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ 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/
21-
COPY ./plugins/threadwinds-ingestion/com.utmstack.threadwinds-ingestion.plugin /workdir/plugins/utmstack/
20+
COPY ./plugins/crowdstrike/com.utmstack.crowdstrike.plugin /workdir/plugins/utmstack/
21+
COPY ./plugins/feeds/com.utmstack.feeds.plugin /workdir/plugins/utmstack/

‎installer/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ require (
8181
golang.org/x/text v0.33.0 // indirect
8282
golang.org/x/time v0.14.0 // indirect
8383
golang.org/x/tools v0.41.0 // indirect
84-
google.golang.org/genproto/googleapis/api v0.0.0-20260114163908-3f89685c29c3 // indirect
85-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260114163908-3f89685c29c3 // indirect
84+
google.golang.org/genproto/googleapis/api v0.0.0-20260120221211-b8f7ae30c516 // indirect
85+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260120221211-b8f7ae30c516 // indirect
8686
google.golang.org/grpc v1.78.0 // indirect
8787
google.golang.org/protobuf v1.36.11 // indirect
8888
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect

0 commit comments

Comments
 (0)