Skip to content

Commit 8a07c64

Browse files
authored
fix(region): vendor update (#23843)
1 parent 802012e commit 8a07c64

File tree

5 files changed

+89
-4
lines changed

5 files changed

+89
-4
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ require (
9898
k8s.io/cri-api v0.28.15
9999
k8s.io/klog/v2 v2.20.0
100100
moul.io/http2curl/v2 v2.3.0
101-
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20251125082607-a10a2fbdfc56
101+
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20251125125822-dc71531a513e
102102
yunion.io/x/executor v0.0.0-20250518005516-5402e9e0bed0
103103
yunion.io/x/jsonutils v1.0.1-0.20250507052344-1abcf4f443b1
104104
yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1672,8 +1672,8 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK
16721672
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
16731673
sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
16741674
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
1675-
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20251125082607-a10a2fbdfc56 h1:gKVu2j2vOCRAgiKdVkjFlqmIpq8ukPBgy4yNog0kPbU=
1676-
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20251125082607-a10a2fbdfc56/go.mod h1:JlmQ8iuGdaAlUkivFVcUAJgi6QYr5jz1vKv7pQ5m7p8=
1675+
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20251125125822-dc71531a513e h1:XS4TBzD7G7sbxMO60nRNkjVRJnIO2FAwpdnq/4KMHd4=
1676+
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20251125125822-dc71531a513e/go.mod h1:JlmQ8iuGdaAlUkivFVcUAJgi6QYr5jz1vKv7pQ5m7p8=
16771677
yunion.io/x/executor v0.0.0-20250518005516-5402e9e0bed0 h1:msG4SiDSVU7CrXH06WuHlNEZXIooTcmNbfrIGHuIHBU=
16781678
yunion.io/x/executor v0.0.0-20250518005516-5402e9e0bed0/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws=
16791679
yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634=

pkg/cloudmon/misc/alerts.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,12 @@ func AlertHistoryReport(ctx context.Context, userCred mcclient.TokenCredential,
5050
}
5151
metrics := []influxdb.SMetricData{}
5252
for _, alert := range alerts.Data {
53+
if alert.ResType == "host" && len(alert.DomainId) == 0 {
54+
continue
55+
}
56+
if alert.ResType == "guest" && len(alert.ProjectId) == 0 {
57+
continue
58+
}
5359
metric := influxdb.SMetricData{}
5460
metric.Name = ALERT_RECORD_HISTORY_MEASUREMENT
5561
metric.Timestamp = time.Now()

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2264,7 +2264,7 @@ sigs.k8s.io/structured-merge-diff/v4/value
22642264
# sigs.k8s.io/yaml v1.2.0
22652265
## explicit; go 1.12
22662266
sigs.k8s.io/yaml
2267-
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20251125082607-a10a2fbdfc56
2267+
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20251125125822-dc71531a513e
22682268
## explicit; go 1.24
22692269
yunion.io/x/cloudmux/pkg/apis
22702270
yunion.io/x/cloudmux/pkg/apis/billing

vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/instance.go

Lines changed: 79 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)