Skip to content

Commit d48ebc4

Browse files
committed
Merge branch 'main' into fix/auditor-view-all-peers
2 parents b12f6d0 + d5081ce commit d48ebc4

File tree

3 files changed

+161
-10
lines changed

3 files changed

+161
-10
lines changed

management/client/grpc.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -128,13 +128,7 @@ func (c *GrpcClient) Sync(ctx context.Context, sysInfo *system.Info, msgHandler
128128
return err
129129
}
130130

131-
streamErr := c.handleStream(ctx, *serverPubKey, sysInfo, msgHandler)
132-
if c.conn.GetState() != connectivity.Shutdown {
133-
if err := c.conn.Close(); err != nil {
134-
log.Warnf("failed closing connection to Management service: %s", err)
135-
}
136-
}
137-
return streamErr
131+
return c.handleStream(ctx, *serverPubKey, sysInfo, msgHandler)
138132
}
139133

140134
err := backoff.Retry(operation, defaultBackoff(ctx))

management/server/http/api/openapi.yml

Lines changed: 91 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2015,6 +2015,32 @@ components:
20152015
- policy_name
20162016
- icmp_type
20172017
- icmp_code
2018+
NetworkTrafficEventsResponse:
2019+
type: object
2020+
properties:
2021+
data:
2022+
type: array
2023+
description: List of network traffic events
2024+
items:
2025+
$ref: "#/components/schemas/NetworkTrafficEvent"
2026+
page:
2027+
type: integer
2028+
description: Current page number
2029+
page_size:
2030+
type: integer
2031+
description: Number of items per page
2032+
total_records:
2033+
type: integer
2034+
description: Total number of event records available
2035+
total_pages:
2036+
type: integer
2037+
description: Total number of pages available
2038+
required:
2039+
- data
2040+
- page
2041+
- page_size
2042+
- total_records
2043+
- total_pages
20182044
responses:
20192045
not_found:
20202046
description: Resource not found
@@ -4231,15 +4257,77 @@ paths:
42314257
tags: [ Events ]
42324258
x-cloud-only: true
42334259
x-experimental: true
4260+
parameters:
4261+
- name: page
4262+
in: query
4263+
description: Page number
4264+
required: false
4265+
schema:
4266+
type: integer
4267+
minimum: 1
4268+
default: 1
4269+
- name: page_size
4270+
in: query
4271+
description: Number of items per page
4272+
required: false
4273+
schema:
4274+
type: integer
4275+
minimum: 1
4276+
maximum: 50000
4277+
default: 1000
4278+
- name: user_id
4279+
in: query
4280+
description: Filter by user ID
4281+
required: false
4282+
schema:
4283+
type: string
4284+
- name: protocol
4285+
in: query
4286+
description: Filter by protocol
4287+
required: false
4288+
schema:
4289+
type: integer
4290+
- name: type
4291+
in: query
4292+
description: Filter by event type
4293+
required: false
4294+
schema:
4295+
type: string
4296+
enum: [TYPE_UNKNOWN, TYPE_START, TYPE_END, TYPE_DROP]
4297+
- name: direction
4298+
in: query
4299+
description: Filter by direction
4300+
required: false
4301+
schema:
4302+
type: string
4303+
enum: [INGRESS, EGRESS, DIRECTION_UNKNOWN]
4304+
- name: search
4305+
in: query
4306+
description: Filters events with a partial match on user email, source and destination names and source and destination addresses
4307+
required: false
4308+
schema:
4309+
type: string
4310+
- name: start_date
4311+
in: query
4312+
description: Start date for filtering events (ISO 8601 format, e.g., 2024-01-01T00:00:00Z).
4313+
required: false
4314+
schema:
4315+
type: string
4316+
format: date-time
4317+
- name: end_date
4318+
in: query
4319+
description: End date for filtering events (ISO 8601 format, e.g., 2024-01-31T23:59:59Z).
4320+
required: false
4321+
schema:
4322+
type: string
4323+
format: date-time
42344324
responses:
42354325
"200":
42364326
description: List of network traffic events
42374327
content:
42384328
application/json:
42394329
schema:
4240-
type: array
4241-
items:
4242-
$ref: "#/components/schemas/NetworkTrafficEvent"
4330+
$ref: "#/components/schemas/NetworkTrafficEventsResponse"
42434331
'400':
42444332
"$ref": "#/components/responses/bad_request"
42454333
'401':

management/server/http/api/types.gen.go

Lines changed: 69 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)