Skip to content

Commit 2e1a1df

Browse files
committed
Merge branch 'release/v12.0.0' of https://github.com/utmstack/UTMStack into release/v12.0.0
2 parents 8471733 + 744a067 commit 2e1a1df

3 files changed

Lines changed: 22 additions & 3 deletions

File tree

backend/modules/mcp/tools_alerts.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func registerAlerts(m *Module) {
2929

3030
type alertsUpdateStatusInput struct {
3131
AlertIDs []string `json:"alert_ids" jsonschema:"OpenSearch _id values of the alerts to update"`
32-
Status int `json:"status" jsonschema:"Target status code (UTMStack convention: 0=open 1=in-review 2=closed)"`
32+
Status int `json:"status" jsonschema:"Target status code (UTMStack convention: 1=automatic-review, 2=open, 3=in-review, 5=completed/closed)"`
3333
StatusObservation string `json:"status_observation,omitempty" jsonschema:"Optional analyst note attached to the status change"`
3434
AddFalsePositiveTag bool `json:"add_false_positive_tag,omitempty" jsonschema:"If true, also apply the FALSE_POSITIVE tag (used when closing as FP)"`
3535
}

frontend/src/features/datasources/components/AgentConsole.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,10 @@ export function AgentConsole({
113113
agentId,
114114
{ command, shell },
115115
{
116-
onOutput: (d) => append('out', d),
116+
onOutput: (d) =>{
117+
append('out', d);
118+
setRunning(false);
119+
},
117120
onError: (m) => append('err', m),
118121
onDone: () => {
119122
setRunning(false)

installer/templates/proxy.go

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
package templates
22

3-
const ProxyUbuntu string = `server {
3+
const ProxyUbuntu string = `map $http_upgrade $connection_upgrade {
4+
default upgrade;
5+
'' close;
6+
}
7+
8+
server {
49
listen 80 default_server;
510
server_name _;
611
return 301 https://$host$request_uri;
@@ -15,6 +20,9 @@ server {
1520
1621
location / {
1722
proxy_pass $utmstack;
23+
proxy_http_version 1.1;
24+
proxy_set_header Upgrade $http_upgrade;
25+
proxy_set_header Connection $connection_upgrade;
1826
proxy_set_header Host $host;
1927
proxy_set_header X-Real-IP $remote_addr;
2028
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -54,6 +62,11 @@ http {
5462
5563
keepalive_timeout 65;
5664
65+
map $http_upgrade $connection_upgrade {
66+
default upgrade;
67+
'' close;
68+
}
69+
5770
server {
5871
listen 80 default_server;
5972
server_name _;
@@ -69,6 +82,9 @@ server {
6982
7083
location / {
7184
proxy_pass $utmstack;
85+
proxy_http_version 1.1;
86+
proxy_set_header Upgrade $http_upgrade;
87+
proxy_set_header Connection $connection_upgrade;
7288
proxy_set_header Host $host;
7389
proxy_set_header X-Real-IP $remote_addr;
7490
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

0 commit comments

Comments
 (0)