Skip to content

Commit 1ebe805

Browse files
authored
Merge pull request #133 from scalyr/update
2 parents 80082e0 + 68425f4 commit 1ebe805

File tree

11 files changed

+287
-465
lines changed

11 files changed

+287
-465
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
#- uses: magefile/mage-action@v2
4747
# with:
4848
# args: lint
49-
- uses: golangci/golangci-lint-action@v3
49+
- uses: golangci/golangci-lint-action@v8
5050
with:
5151
version: 'latest'
5252
working-directory: pkg

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## 3.1.5
4+
5+
- Updated grafana-plugin-sdk-go to 0.250.0
6+
37
## 3.1.4
48

59
- Healthcheck bugfix, thanks @lutzwillek-tomtom

LICENSE

Lines changed: 10 additions & 198 deletions
Original file line numberDiff line numberDiff line change
@@ -1,201 +1,13 @@
1-
Apache License
2-
Version 2.0, January 2004
3-
http://www.apache.org/licenses/
1+
Copyright 2025 SentinelOne, Inc.
42

5-
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
3+
Licensed under the Apache License, Version 2.0 (the "License");
4+
you may not use this file except in compliance with the License.
5+
You may obtain a copy of the License at
66

7-
1. Definitions.
7+
http://www.apache.org/licenses/LICENSE-2.0
88

9-
"License" shall mean the terms and conditions for use, reproduction,
10-
and distribution as defined by Sections 1 through 9 of this document.
11-
12-
"Licensor" shall mean the copyright owner or entity authorized by
13-
the copyright owner that is granting the License.
14-
15-
"Legal Entity" shall mean the union of the acting entity and all
16-
other entities that control, are controlled by, or are under common
17-
control with that entity. For the purposes of this definition,
18-
"control" means (i) the power, direct or indirect, to cause the
19-
direction or management of such entity, whether by contract or
20-
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21-
outstanding shares, or (iii) beneficial ownership of such entity.
22-
23-
"You" (or "Your") shall mean an individual or Legal Entity
24-
exercising permissions granted by this License.
25-
26-
"Source" form shall mean the preferred form for making modifications,
27-
including but not limited to software source code, documentation
28-
source, and configuration files.
29-
30-
"Object" form shall mean any form resulting from mechanical
31-
transformation or translation of a Source form, including but
32-
not limited to compiled object code, generated documentation,
33-
and conversions to other media types.
34-
35-
"Work" shall mean the work of authorship, whether in Source or
36-
Object form, made available under the License, as indicated by a
37-
copyright notice that is included in or attached to the work
38-
(an example is provided in the Appendix below).
39-
40-
"Derivative Works" shall mean any work, whether in Source or Object
41-
form, that is based on (or derived from) the Work and for which the
42-
editorial revisions, annotations, elaborations, or other modifications
43-
represent, as a whole, an original work of authorship. For the purposes
44-
of this License, Derivative Works shall not include works that remain
45-
separable from, or merely link (or bind by name) to the interfaces of,
46-
the Work and Derivative Works thereof.
47-
48-
"Contribution" shall mean any work of authorship, including
49-
the original version of the Work and any modifications or additions
50-
to that Work or Derivative Works thereof, that is intentionally
51-
submitted to Licensor for inclusion in the Work by the copyright owner
52-
or by an individual or Legal Entity authorized to submit on behalf of
53-
the copyright owner. For the purposes of this definition, "submitted"
54-
means any form of electronic, verbal, or written communication sent
55-
to the Licensor or its representatives, including but not limited to
56-
communication on electronic mailing lists, source code control systems,
57-
and issue tracking systems that are managed by, or on behalf of, the
58-
Licensor for the purpose of discussing and improving the Work, but
59-
excluding communication that is conspicuously marked or otherwise
60-
designated in writing by the copyright owner as "Not a Contribution."
61-
62-
"Contributor" shall mean Licensor and any individual or Legal Entity
63-
on behalf of whom a Contribution has been received by Licensor and
64-
subsequently incorporated within the Work.
65-
66-
2. Grant of Copyright License. Subject to the terms and conditions of
67-
this License, each Contributor hereby grants to You a perpetual,
68-
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69-
copyright license to reproduce, prepare Derivative Works of,
70-
publicly display, publicly perform, sublicense, and distribute the
71-
Work and such Derivative Works in Source or Object form.
72-
73-
3. Grant of Patent License. Subject to the terms and conditions of
74-
this License, each Contributor hereby grants to You a perpetual,
75-
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76-
(except as stated in this section) patent license to make, have made,
77-
use, offer to sell, sell, import, and otherwise transfer the Work,
78-
where such license applies only to those patent claims licensable
79-
by such Contributor that are necessarily infringed by their
80-
Contribution(s) alone or by combination of their Contribution(s)
81-
with the Work to which such Contribution(s) was submitted. If You
82-
institute patent litigation against any entity (including a
83-
cross-claim or counterclaim in a lawsuit) alleging that the Work
84-
or a Contribution incorporated within the Work constitutes direct
85-
or contributory patent infringement, then any patent licenses
86-
granted to You under this License for that Work shall terminate
87-
as of the date such litigation is filed.
88-
89-
4. Redistribution. You may reproduce and distribute copies of the
90-
Work or Derivative Works thereof in any medium, with or without
91-
modifications, and in Source or Object form, provided that You
92-
meet the following conditions:
93-
94-
(a) You must give any other recipients of the Work or
95-
Derivative Works a copy of this License; and
96-
97-
(b) You must cause any modified files to carry prominent notices
98-
stating that You changed the files; and
99-
100-
(c) You must retain, in the Source form of any Derivative Works
101-
that You distribute, all copyright, patent, trademark, and
102-
attribution notices from the Source form of the Work,
103-
excluding those notices that do not pertain to any part of
104-
the Derivative Works; and
105-
106-
(d) If the Work includes a "NOTICE" text file as part of its
107-
distribution, then any Derivative Works that You distribute must
108-
include a readable copy of the attribution notices contained
109-
within such NOTICE file, excluding those notices that do not
110-
pertain to any part of the Derivative Works, in at least one
111-
of the following places: within a NOTICE text file distributed
112-
as part of the Derivative Works; within the Source form or
113-
documentation, if provided along with the Derivative Works; or,
114-
within a display generated by the Derivative Works, if and
115-
wherever such third-party notices normally appear. The contents
116-
of the NOTICE file are for informational purposes only and
117-
do not modify the License. You may add Your own attribution
118-
notices within Derivative Works that You distribute, alongside
119-
or as an addendum to the NOTICE text from the Work, provided
120-
that such additional attribution notices cannot be construed
121-
as modifying the License.
122-
123-
You may add Your own copyright statement to Your modifications and
124-
may provide additional or different license terms and conditions
125-
for use, reproduction, or distribution of Your modifications, or
126-
for any such Derivative Works as a whole, provided Your use,
127-
reproduction, and distribution of the Work otherwise complies with
128-
the conditions stated in this License.
129-
130-
5. Submission of Contributions. Unless You explicitly state otherwise,
131-
any Contribution intentionally submitted for inclusion in the Work
132-
by You to the Licensor shall be under the terms and conditions of
133-
this License, without any additional terms or conditions.
134-
Notwithstanding the above, nothing herein shall supersede or modify
135-
the terms of any separate license agreement you may have executed
136-
with Licensor regarding such Contributions.
137-
138-
6. Trademarks. This License does not grant permission to use the trade
139-
names, trademarks, service marks, or product names of the Licensor,
140-
except as required for reasonable and customary use in describing the
141-
origin of the Work and reproducing the content of the NOTICE file.
142-
143-
7. Disclaimer of Warranty. Unless required by applicable law or
144-
agreed to in writing, Licensor provides the Work (and each
145-
Contributor provides its Contributions) on an "AS IS" BASIS,
146-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147-
implied, including, without limitation, any warranties or conditions
148-
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149-
PARTICULAR PURPOSE. You are solely responsible for determining the
150-
appropriateness of using or redistributing the Work and assume any
151-
risks associated with Your exercise of permissions under this License.
152-
153-
8. Limitation of Liability. In no event and under no legal theory,
154-
whether in tort (including negligence), contract, or otherwise,
155-
unless required by applicable law (such as deliberate and grossly
156-
negligent acts) or agreed to in writing, shall any Contributor be
157-
liable to You for damages, including any direct, indirect, special,
158-
incidental, or consequential damages of any character arising as a
159-
result of this License or out of the use or inability to use the
160-
Work (including but not limited to damages for loss of goodwill,
161-
work stoppage, computer failure or malfunction, or any and all
162-
other commercial damages or losses), even if such Contributor
163-
has been advised of the possibility of such damages.
164-
165-
9. Accepting Warranty or Additional Liability. While redistributing
166-
the Work or Derivative Works thereof, You may choose to offer,
167-
and charge a fee for, acceptance of support, warranty, indemnity,
168-
or other liability obligations and/or rights consistent with this
169-
License. However, in accepting such obligations, You may act only
170-
on Your own behalf and on Your sole responsibility, not on behalf
171-
of any other Contributor, and only if You agree to indemnify,
172-
defend, and hold each Contributor harmless for any liability
173-
incurred by, or claims asserted against, such Contributor by reason
174-
of your accepting any such warranty or additional liability.
175-
176-
END OF TERMS AND CONDITIONS
177-
178-
APPENDIX: How to apply the Apache License to your work.
179-
180-
To apply the Apache License to your work, attach the following
181-
boilerplate notice, with the fields enclosed by brackets "{}"
182-
replaced with your own identifying information. (Don't include
183-
the brackets!) The text should be enclosed in the appropriate
184-
comment syntax for the file format. We also recommend that a
185-
file or class name and description of purpose be included on the
186-
same "printed page" as the copyright notice for easier
187-
identification within third-party archives.
188-
189-
Copyright {yyyy} {name of copyright owner}
190-
191-
Licensed under the Apache License, Version 2.0 (the "License");
192-
you may not use this file except in compliance with the License.
193-
You may obtain a copy of the License at
194-
195-
http://www.apache.org/licenses/LICENSE-2.0
196-
197-
Unless required by applicable law or agreed to in writing, software
198-
distributed under the License is distributed on an "AS IS" BASIS,
199-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200-
See the License for the specific language governing permissions and
201-
limitations under the License.
9+
Unless required by applicable law or agreed to in writing, software
10+
distributed under the License is distributed on an "AS IS" BASIS,
11+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
See the License for the specific language governing permissions and
13+
limitations under the License.

Magefile.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
//+build mage
1+
//go:build mage
2+
// +build mage
23

34
package main
45

go.mod

Lines changed: 71 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,97 @@
11
module github.com/scalyr/scalyr-grafana-datasource-plugin
22

3-
go 1.20
3+
go 1.21
4+
5+
toolchain go1.24.1
46

57
require (
6-
github.com/grafana/grafana-plugin-sdk-go v0.155.0
8+
github.com/grafana/grafana-plugin-sdk-go v0.250.0
79
golang.org/x/time v0.3.0
810
)
911

1012
require (
11-
github.com/BurntSushi/toml v1.2.1 // indirect
12-
github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40 // indirect
13+
github.com/BurntSushi/toml v1.3.2 // indirect
14+
github.com/apache/arrow/go/v15 v15.0.2 // indirect
1315
github.com/beorn7/perks v1.0.1 // indirect
14-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
16+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
17+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
1518
github.com/cheekybits/genny v1.0.0 // indirect
1619
github.com/chromedp/cdproto v0.0.0-20220208224320-6efb837e6bc2 // indirect
17-
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
18-
github.com/elazarl/goproxy v0.0.0-20220115173737-adb46da277ac // indirect
19-
github.com/fatih/color v1.7.0 // indirect
20-
github.com/getkin/kin-openapi v0.94.0 // indirect
21-
github.com/ghodss/yaml v1.0.0 // indirect
22-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
23-
github.com/go-openapi/swag v0.19.15 // indirect
24-
github.com/golang/protobuf v1.5.2 // indirect
25-
github.com/golang/snappy v0.0.3 // indirect
26-
github.com/google/flatbuffers v2.0.0+incompatible // indirect
27-
github.com/google/go-cmp v0.5.9 // indirect
28-
github.com/google/uuid v1.3.0 // indirect
29-
github.com/gorilla/mux v1.8.0 // indirect
30-
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
31-
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
32-
github.com/hashicorp/go-hclog v0.14.1 // indirect
33-
github.com/hashicorp/go-plugin v1.4.3 // indirect
34-
github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect
20+
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
21+
github.com/elazarl/goproxy v0.0.0-20230731152917-f99041a5c027 // indirect
22+
github.com/fatih/color v1.15.0 // indirect
23+
github.com/getkin/kin-openapi v0.124.0 // indirect
24+
github.com/go-logr/logr v1.4.2 // indirect
25+
github.com/go-logr/stdr v1.2.2 // indirect
26+
github.com/go-openapi/jsonpointer v0.20.2 // indirect
27+
github.com/go-openapi/swag v0.22.8 // indirect
28+
github.com/goccy/go-json v0.10.2 // indirect
29+
github.com/gogo/protobuf v1.3.2 // indirect
30+
github.com/golang/protobuf v1.5.4 // indirect
31+
github.com/google/flatbuffers v23.5.26+incompatible // indirect
32+
github.com/google/go-cmp v0.6.0 // indirect
33+
github.com/google/uuid v1.6.0 // indirect
34+
github.com/gorilla/mux v1.8.1 // indirect
35+
github.com/grafana/otel-profiling-go v0.5.1 // indirect
36+
github.com/grafana/pyroscope-go/godeltaprof v0.1.8 // indirect
37+
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1 // indirect
38+
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 // indirect
39+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
40+
github.com/hashicorp/go-hclog v1.6.3 // indirect
41+
github.com/hashicorp/go-plugin v1.6.1 // indirect
42+
github.com/hashicorp/yamux v0.1.1 // indirect
43+
github.com/invopop/yaml v0.2.0 // indirect
3544
github.com/josharian/intern v1.0.0 // indirect
3645
github.com/json-iterator/go v1.1.12 // indirect
37-
github.com/klauspost/compress v1.13.1 // indirect
38-
github.com/magefile/mage v1.14.0 // indirect
46+
github.com/klauspost/compress v1.17.9 // indirect
47+
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
48+
github.com/magefile/mage v1.15.0 // indirect
3949
github.com/mailru/easyjson v0.7.7 // indirect
4050
github.com/mattetti/filebuffer v1.0.1 // indirect
41-
github.com/mattn/go-colorable v0.1.4 // indirect
42-
github.com/mattn/go-isatty v0.0.10 // indirect
51+
github.com/mattn/go-colorable v0.1.13 // indirect
52+
github.com/mattn/go-isatty v0.0.19 // indirect
4353
github.com/mattn/go-runewidth v0.0.9 // indirect
44-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
45-
github.com/mitchellh/go-testing-interface v1.0.0 // indirect
54+
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
4655
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4756
github.com/modern-go/reflect2 v1.0.2 // indirect
48-
github.com/oklog/run v1.0.0 // indirect
57+
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
58+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
59+
github.com/oklog/run v1.1.0 // indirect
4960
github.com/olekukonko/tablewriter v0.0.5 // indirect
50-
github.com/pierrec/lz4/v4 v4.1.8 // indirect
51-
github.com/prometheus/client_golang v1.14.0 // indirect
52-
github.com/prometheus/client_model v0.3.0 // indirect
53-
github.com/prometheus/common v0.40.0 // indirect
54-
github.com/prometheus/procfs v0.8.0 // indirect
61+
github.com/perimeterx/marshmallow v1.1.5 // indirect
62+
github.com/pierrec/lz4/v4 v4.1.18 // indirect
63+
github.com/prometheus/client_golang v1.20.3 // indirect
64+
github.com/prometheus/client_model v0.6.1 // indirect
65+
github.com/prometheus/common v0.55.0 // indirect
66+
github.com/prometheus/procfs v0.15.1 // indirect
5567
github.com/russross/blackfriday/v2 v2.1.0 // indirect
5668
github.com/unknwon/bra v0.0.0-20200517080246-1e3013ecaff8 // indirect
5769
github.com/unknwon/com v1.0.1 // indirect
5870
github.com/unknwon/log v0.0.0-20150304194804-e617c87089d3 // indirect
59-
github.com/urfave/cli v1.22.12 // indirect
60-
golang.org/x/net v0.8.0 // indirect
61-
golang.org/x/sys v0.6.0 // indirect
62-
golang.org/x/text v0.8.0 // indirect
63-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
71+
github.com/urfave/cli v1.22.15 // indirect
72+
github.com/zeebo/xxh3 v1.0.2 // indirect
73+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
74+
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.53.0 // indirect
75+
go.opentelemetry.io/contrib/propagators/jaeger v1.29.0 // indirect
76+
go.opentelemetry.io/contrib/samplers/jaegerremote v0.23.0 // indirect
77+
go.opentelemetry.io/otel v1.29.0 // indirect
78+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.29.0 // indirect
79+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect
80+
go.opentelemetry.io/otel/metric v1.29.0 // indirect
81+
go.opentelemetry.io/otel/sdk v1.29.0 // indirect
82+
go.opentelemetry.io/otel/trace v1.29.0 // indirect
83+
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
84+
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
85+
golang.org/x/mod v0.17.0 // indirect
86+
golang.org/x/net v0.29.0 // indirect
87+
golang.org/x/sync v0.8.0 // indirect
88+
golang.org/x/sys v0.25.0 // indirect
89+
golang.org/x/text v0.18.0 // indirect
90+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
91+
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
6492
google.golang.org/genproto v0.0.0-20210630183607-d20f26d13c79 // indirect
65-
google.golang.org/grpc v1.41.0 // indirect
66-
google.golang.org/protobuf v1.28.1 // indirect
93+
google.golang.org/grpc v1.66.0 // indirect
94+
google.golang.org/protobuf v1.34.2 // indirect
6795
gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect
68-
gopkg.in/yaml.v2 v2.4.0 // indirect
96+
gopkg.in/yaml.v3 v3.0.1 // indirect
6997
)

0 commit comments

Comments
 (0)