Skip to content

Commit cadef0c

Browse files
authored
Merge pull request #59 from OpenSLO/sumo-agaurav
2 parents 247a5b9 + 34dfd77 commit cadef0c

10 files changed

Lines changed: 24 additions & 16 deletions

File tree

.goreleaser.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,27 @@ before:
88
- go generate ./...
99
builds:
1010
- env:
11-
- CGO_ENABLED=0
11+
- CGO_ENABLED=1
1212
goos:
13-
- linux
1413
- darwin
14+
goarch:
15+
- amd64
16+
- arm
17+
- arm64
18+
ignore:
19+
- goos: linux
20+
goarch: arm64
21+
- goos: linux
22+
goarch: arm
1523
archives:
1624
- replacements:
1725
darwin: Darwin
1826
linux: Linux
19-
386: i386
2027
amd64: x86_64
2128
checksum:
2229
name_template: 'checksums.txt'
2330
snapshot:
24-
name_template: "{{ incpatch .Version }}-next"
31+
name_template: "{{ incpatch .Version }}"
2532
changelog:
2633
sort: asc
2734
filters:

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
### [v1.0](https://github.com/OpenSLO/slogen/releases/tag/v1.0.0)
22

33
- **Feature** : Support for OpenSLO v1 spec for `SLO`, `AlertPolicy` and `AlertNotificationTarget`
4+
- `AlertPolicy` and `AlertNotificationTarget` based approach removes the need for created duplicate alerting configs with each `SLO`
45
- **Feature** : Support for sumologic native SLO & SLO based monitors.
56
- **Feature** : Generates flow graph of which `SLO` are using which `AlertPolicy` and `AlertNotificationTarget`
67

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ It can be done with
3131
export PATH=`go env GOPATH`/bin:$PATH
3232
```
3333

34+
The pre-compiled binaries for specific platforms are also available on the [release](https://github.com/OpenSLO/slogen/releases) page.
35+
3436
### Using the tool
3537

3638
##### Set the sumologic auth as `ENV` variables as required by the [terraform provider](https://registry.terraform.io/providers/SumoLogic/sumologic/latest/docs#environment-variables):

credits/LIST.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ golang.org/x/oauth2,Unknown,BSD-3-Clause
5454
google.golang.org/genproto/googleapis,Unknown,Apache-2.0
5555
google.golang.org/api/internal/third_party/uritemplates,Unknown,BSD-3-Clause
5656
github.com/kr/pretty,https://github.com/kr/pretty/blob/master/License,MIT
57-
github.com/OpenSLO/oslo/pkg/manifest,https://github.com/OpenSLO/oslo/blob/master/pkg/manifest/LICENSE,Apache-2.0
57+
github.com/agaurav/oslo/pkg/manifest,https://github.com/agaurav/oslo/blob/master/pkg/manifest/LICENSE,Apache-2.0
5858
github.com/fatih/color,https://github.com/fatih/color/blob/master/LICENSE.md,MIT
5959
github.com/hashicorp/hcl,https://github.com/hashicorp/hcl/blob/master/LICENSE,MPL-2.0
6060
github.com/hashicorp/go-cleanhttp,https://github.com/hashicorp/go-cleanhttp/blob/master/LICENSE,MPL-2.0

go.mod

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/OpenSLO/slogen
33
go 1.18
44

55
require (
6-
//github.com/OpenSLO/oslo v0.5.1
6+
//github.com/agaurav/oslo v0.5.1
77
github.com/fatih/color v1.13.0
88
github.com/go-resty/resty/v2 v2.7.0
99
github.com/goccy/go-graphviz v0.0.9
@@ -19,7 +19,7 @@ require (
1919
gopkg.in/yaml.v3 v3.0.1
2020
)
2121

22-
require github.com/OpenSLO/oslo v0.0.0-00010101000000-000000000000
22+
require github.com/agaurav/oslo v0.5.14-0.20220809161632-b86360f4da5b
2323

2424
require (
2525
github.com/chzyer/readline v1.5.1 // indirect
@@ -55,5 +55,3 @@ require (
5555
gopkg.in/ini.v1 v1.66.6 // indirect
5656
gopkg.in/yaml.v2 v2.4.0 // indirect
5757
)
58-
59-
replace github.com/OpenSLO/oslo => github.com/agaurav/oslo v0.5.13

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 h1:YoJbenK9C6
4545
github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo=
4646
github.com/acomagu/bufpipe v1.0.3 h1:fxAGrHZTgQ9w5QqVItgzwj235/uYZYgbXitB+dLupOk=
4747
github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4=
48-
github.com/agaurav/oslo v0.5.13 h1:rnUZeqAQQfJqKRoZoalBlI/YqePmFF7unKH6CMeMEsA=
49-
github.com/agaurav/oslo v0.5.13/go.mod h1:QEy6FSCxj2DkXBtjCiCvQz2DG9CRhdGM/pNp+iZ1AcY=
48+
github.com/agaurav/oslo v0.5.14-0.20220809161632-b86360f4da5b h1:7x/mWECFJe/7sX1vS6WWMQhMF+YDHYTcbDVnt9DC3rs=
49+
github.com/agaurav/oslo v0.5.14-0.20220809161632-b86360f4da5b/go.mod h1:wzCbY/MYe5WNWj6DkqHs0vUzHf4t07N3TqpNYgw8kmo=
5050
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
5151
github.com/apparentlymart/go-textseg v1.0.0/go.mod h1:z96Txxhf3xSFMPmb5X/1W05FF/Nj9VFpLOpjS5yuumk=
5252
github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo=

libs/gen.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"bytes"
55
"embed"
66
"fmt"
7-
oslo "github.com/OpenSLO/oslo/pkg/manifest/v1"
87
"github.com/OpenSLO/slogen/libs/specs"
98
"github.com/OpenSLO/slogen/libs/sumologic"
9+
oslo "github.com/agaurav/oslo/pkg/manifest/v1"
1010
"os"
1111
"path/filepath"
1212
"sort"

libs/spec.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package libs
22

33
import (
44
"fmt"
5-
oslo "github.com/OpenSLO/oslo/pkg/manifest/v1"
6-
"github.com/OpenSLO/oslo/pkg/manifest/v1alpha"
75
"github.com/OpenSLO/slogen/libs/specs"
6+
oslo "github.com/agaurav/oslo/pkg/manifest/v1"
7+
"github.com/agaurav/oslo/pkg/manifest/v1alpha"
88
"gopkg.in/yaml.v3"
99
"os"
1010
)

libs/specs/specs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package specs
22

3-
import "github.com/OpenSLO/oslo/pkg/manifest/v1"
3+
import "github.com/agaurav/oslo/pkg/manifest/v1"
44

55
type OpenSLOSpec struct {
66
*v1.SLO `yaml:",inline"`

libs/sumologic/native.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package sumologic
22

33
import (
44
"fmt"
5-
oslo "github.com/OpenSLO/oslo/pkg/manifest/v1"
65
"github.com/OpenSLO/slogen/libs/specs"
76
"github.com/OpenSLO/slogen/libs/sumologic/sumotf"
7+
oslo "github.com/agaurav/oslo/pkg/manifest/v1"
88
"log"
99
"strconv"
1010
"strings"

0 commit comments

Comments
 (0)