mirror of
https://github.com/grafana/grafana.git
synced 2025-12-23 05:04:29 +08:00
Compare commits
4 Commits
sriram/pos
...
v10.4.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
03f502a94d | ||
|
|
1ad2a75022 | ||
|
|
c385d058cc | ||
|
|
69e121a499 |
272
.drone.yml
272
.drone.yml
File diff suppressed because it is too large
Load Diff
2
.github/workflows/alerting-swagger-gen.yml
vendored
2
.github/workflows/alerting-swagger-gen.yml
vendored
@@ -16,7 +16,7 @@ jobs:
|
|||||||
- name: Set go version
|
- name: Set go version
|
||||||
uses: actions/setup-go@v4
|
uses: actions/setup-go@v4
|
||||||
with:
|
with:
|
||||||
go-version: '1.21.6'
|
go-version: '1.21.8'
|
||||||
- name: Build swagger
|
- name: Build swagger
|
||||||
run: |
|
run: |
|
||||||
make -C pkg/services/ngalert/api/tooling post.json api.json
|
make -C pkg/services/ngalert/api/tooling post.json api.json
|
||||||
|
|||||||
2
.github/workflows/codeql-analysis.yml
vendored
2
.github/workflows/codeql-analysis.yml
vendored
@@ -47,7 +47,7 @@ jobs:
|
|||||||
name: Set go version
|
name: Set go version
|
||||||
uses: actions/setup-go@v4
|
uses: actions/setup-go@v4
|
||||||
with:
|
with:
|
||||||
go-version: '1.21.6'
|
go-version: '1.21.8'
|
||||||
|
|
||||||
# Initializes the CodeQL tools for scanning.
|
# Initializes the CodeQL tools for scanning.
|
||||||
- name: Initialize CodeQL
|
- name: Initialize CodeQL
|
||||||
|
|||||||
2
.github/workflows/pr-codeql-analysis-go.yml
vendored
2
.github/workflows/pr-codeql-analysis-go.yml
vendored
@@ -35,7 +35,7 @@ jobs:
|
|||||||
- name: Set go version
|
- name: Set go version
|
||||||
uses: actions/setup-go@v4
|
uses: actions/setup-go@v4
|
||||||
with:
|
with:
|
||||||
go-version: '1.21.6'
|
go-version: '1.21.8'
|
||||||
|
|
||||||
# Initializes the CodeQL tools for scanning.
|
# Initializes the CodeQL tools for scanning.
|
||||||
- name: Initialize CodeQL
|
- name: Initialize CodeQL
|
||||||
|
|||||||
2
.github/workflows/publish-kinds-next.yml
vendored
2
.github/workflows/publish-kinds-next.yml
vendored
@@ -36,7 +36,7 @@ jobs:
|
|||||||
- name: "Setup Go"
|
- name: "Setup Go"
|
||||||
uses: "actions/setup-go@v4"
|
uses: "actions/setup-go@v4"
|
||||||
with:
|
with:
|
||||||
go-version: '1.21.6'
|
go-version: '1.21.8'
|
||||||
|
|
||||||
- name: "Verify kinds"
|
- name: "Verify kinds"
|
||||||
run: go run .github/workflows/scripts/kinds/verify-kinds.go
|
run: go run .github/workflows/scripts/kinds/verify-kinds.go
|
||||||
|
|||||||
2
.github/workflows/publish-kinds-release.yml
vendored
2
.github/workflows/publish-kinds-release.yml
vendored
@@ -39,7 +39,7 @@ jobs:
|
|||||||
- name: "Setup Go"
|
- name: "Setup Go"
|
||||||
uses: "actions/setup-go@v4"
|
uses: "actions/setup-go@v4"
|
||||||
with:
|
with:
|
||||||
go-version: '1.21.6'
|
go-version: '1.21.8'
|
||||||
|
|
||||||
- name: "Verify kinds"
|
- name: "Verify kinds"
|
||||||
run: go run .github/workflows/scripts/kinds/verify-kinds.go
|
run: go run .github/workflows/scripts/kinds/verify-kinds.go
|
||||||
|
|||||||
2
.github/workflows/verify-kinds.yml
vendored
2
.github/workflows/verify-kinds.yml
vendored
@@ -18,7 +18,7 @@ jobs:
|
|||||||
- name: "Setup Go"
|
- name: "Setup Go"
|
||||||
uses: "actions/setup-go@v4"
|
uses: "actions/setup-go@v4"
|
||||||
with:
|
with:
|
||||||
go-version: '1.21.6'
|
go-version: '1.21.8'
|
||||||
|
|
||||||
- name: "Verify kinds"
|
- name: "Verify kinds"
|
||||||
run: go run .github/workflows/scripts/kinds/verify-kinds.go
|
run: go run .github/workflows/scripts/kinds/verify-kinds.go
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
ARG BASE_IMAGE=alpine:3.18.5
|
ARG BASE_IMAGE=alpine:3.18.5
|
||||||
ARG JS_IMAGE=node:20-alpine3.18
|
ARG JS_IMAGE=node:20-alpine3.18
|
||||||
ARG JS_PLATFORM=linux/amd64
|
ARG JS_PLATFORM=linux/amd64
|
||||||
ARG GO_IMAGE=golang:1.21.6-alpine3.18
|
ARG GO_IMAGE=golang:1.21.8-alpine3.18
|
||||||
|
|
||||||
ARG GO_SRC=go-builder
|
ARG GO_SRC=go-builder
|
||||||
ARG JS_SRC=js-builder
|
ARG JS_SRC=js-builder
|
||||||
|
|||||||
2
Makefile
2
Makefile
@@ -256,7 +256,7 @@ build-docker-full-ubuntu: ## Build Docker image based on Ubuntu for development.
|
|||||||
--build-arg COMMIT_SHA=$$(git rev-parse HEAD) \
|
--build-arg COMMIT_SHA=$$(git rev-parse HEAD) \
|
||||||
--build-arg BUILD_BRANCH=$$(git rev-parse --abbrev-ref HEAD) \
|
--build-arg BUILD_BRANCH=$$(git rev-parse --abbrev-ref HEAD) \
|
||||||
--build-arg BASE_IMAGE=ubuntu:22.04 \
|
--build-arg BASE_IMAGE=ubuntu:22.04 \
|
||||||
--build-arg GO_IMAGE=golang:1.21.6 \
|
--build-arg GO_IMAGE=golang:1.21.8 \
|
||||||
--tag grafana/grafana$(TAG_SUFFIX):dev-ubuntu \
|
--tag grafana/grafana$(TAG_SUFFIX):dev-ubuntu \
|
||||||
$(DOCKER_BUILD_ARGS)
|
$(DOCKER_BUILD_ARGS)
|
||||||
|
|
||||||
|
|||||||
@@ -61,7 +61,7 @@
|
|||||||
"plugin:build:dev": "lerna run dev --ignore=\"@grafana/*\" --ignore=\"@grafana-plugins/input-datasource\""
|
"plugin:build:dev": "lerna run dev --ignore=\"@grafana/*\" --ignore=\"@grafana-plugins/input-datasource\""
|
||||||
},
|
},
|
||||||
"grafana": {
|
"grafana": {
|
||||||
"whatsNewUrl": "https://grafana.com/docs/grafana/next/whatsnew/whats-new-in-v10-3/",
|
"whatsNewUrl": "https://grafana.com/docs/grafana/next/whatsnew/whats-new-in-v10-4/",
|
||||||
"releaseNotesUrl": "https://grafana.com/docs/grafana/next/release-notes/"
|
"releaseNotesUrl": "https://grafana.com/docs/grafana/next/release-notes/"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ export class TimelineChart extends React.Component<TimelineProps> {
|
|||||||
rowHeight: alignedFrame.fields.length > 2 ? this.props.rowHeight : 1,
|
rowHeight: alignedFrame.fields.length > 2 ? this.props.rowHeight : 1,
|
||||||
getValueColor: this.getValueColor,
|
getValueColor: this.getValueColor,
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
hoverMulti: this.props.tooltip.mode === TooltipDisplayMode.Multi,
|
hoverMulti: this.props.tooltip?.mode === TooltipDisplayMode.Multi,
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ images = {
|
|||||||
"node": "node:{}-alpine".format(nodejs_version),
|
"node": "node:{}-alpine".format(nodejs_version),
|
||||||
"cloudsdk": "google/cloud-sdk:431.0.0",
|
"cloudsdk": "google/cloud-sdk:431.0.0",
|
||||||
"publish": "grafana/grafana-ci-deploy:1.3.3",
|
"publish": "grafana/grafana-ci-deploy:1.3.3",
|
||||||
"alpine": "alpine:3.18.5",
|
"alpine": "alpine:3.19.1",
|
||||||
"ubuntu": "ubuntu:22.04",
|
"ubuntu": "ubuntu:22.04",
|
||||||
"curl": "byrnedo/alpine-curl:0.1.8",
|
"curl": "byrnedo/alpine-curl:0.1.8",
|
||||||
"plugins_slack": "plugins/slack",
|
"plugins_slack": "plugins/slack",
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ global variables
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
grabpl_version = "v3.0.50"
|
grabpl_version = "v3.0.50"
|
||||||
golang_version = "1.21.6"
|
golang_version = "1.21.8"
|
||||||
|
|
||||||
# nodejs_version should match what's in ".nvmrc", but without the v prefix.
|
# nodejs_version should match what's in ".nvmrc", but without the v prefix.
|
||||||
nodejs_version = "20.9.0"
|
nodejs_version = "20.9.0"
|
||||||
|
|||||||
Reference in New Issue
Block a user