Skip to content

Commit 38df39a

Browse files
authored
Sync with skywalking upstream (istio#34)
Signed-off-by: Gao Hongtao <[email protected]>
1 parent 27beadb commit 38df39a

File tree

5 files changed

+90
-53
lines changed

5 files changed

+90
-53
lines changed

.vscode/settings.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"cSpell.enableFiletypes": [
3+
"proto3"
4+
]
5+
}

spm/notification/v1/tetrateio.api.tcc.spm.notification.v1.pb.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,7 @@ <h3 id="AlertMessage">AlertMessage</h3>
578578
<tbody>
579579
<tr id="AlertMessage-scopeId">
580580
<td><code>scopeId</code></td>
581-
<td><code>int32</code></td>
581+
<td><code>int64</code></td>
582582
<td>
583583
<p>All scopes are defined in org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.</p>
584584

@@ -609,7 +609,7 @@ <h3 id="AlertMessage">AlertMessage</h3>
609609
</tr>
610610
<tr id="AlertMessage-id0">
611611
<td><code>id0</code></td>
612-
<td><code>int32</code></td>
612+
<td><code>string</code></td>
613613
<td>
614614
<p>The ID of scope entity, matched the name.</p>
615615

@@ -620,7 +620,7 @@ <h3 id="AlertMessage">AlertMessage</h3>
620620
</tr>
621621
<tr id="AlertMessage-id1">
622622
<td><code>id1</code></td>
623-
<td><code>int32</code></td>
623+
<td><code>string</code></td>
624624
<td>
625625
<p>Not used today.</p>
626626

spm/notification/v1/webhook.pb.go

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

spm/notification/v1/webhook.pb.validate.go

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

spm/notification/v1/webhook.proto

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ import "validate/validate.proto";
1111
// https://github.com/apache/skywalking/blob/master/docs/en/setup/backend/backend-alarm.md#webhook
1212
message AlertMessage {
1313
// All scopes are defined in org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.
14-
int32 scopeId = 1 [(validate.rules).int32.gte = 0];
14+
int64 scopeId = 1 [(validate.rules).int64.gte = 0];
1515
string scope = 2 [(validate.rules).string.min_len = 1];
1616
// Target scope entity name.
1717
string name = 3 [(validate.rules).string.min_len = 1];
1818
// The ID of scope entity, matched the name.
19-
int32 id0 = 4 [(validate.rules).int32.gte = 0];
19+
string id0 = 4 [(validate.rules).string.min_len = 0];
2020
// Not used today.
21-
int32 id1 = 5;
21+
string id1 = 5;
2222
// The rule name you configured in alarm-settings
2323
string ruleName = 6 [(validate.rules).string.min_len = 1];
2424
// Alarm text message.

0 commit comments

Comments
 (0)