IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

remove latest.json and replace with api call to grafana.com

Browse Source
This commit is contained in:
Ashley Harrison 2024-01-15 10:51:38 +00:00
parent 083605c17f
commit 02b867d84e
No known key found for this signature in database
GPG Key ID: AEC29E54E8D7CD90
11 changed files with 15 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.drone.yml
View File

@ -744,7 +744,6 @@ trigger:
exclude:
- '*.md'
- docs/**
- latest.json
type: docker
volumes:
- host:
@ -1080,7 +1079,6 @@ trigger:
- '*.md'
- docs/**
- packages/**/*.md
- latest.json
repo:
- grafana/grafana
type: docker
@ -1124,7 +1122,6 @@ trigger:
exclude:
- '*.md'
- docs/**
- latest.json
include:
- scripts/**/*.sh
type: docker
@ -1436,7 +1433,6 @@ trigger:
- '*.md'
- docs/**
- packages/**/*.md
- latest.json
repo:
- grafana/grafana
type: docker
@ -1493,7 +1489,6 @@ trigger:
exclude:
- '*.md'
- docs/**
- latest.json
repo:
- grafana/grafana
type: docker
@ -1561,7 +1556,6 @@ trigger:
exclude:
- '*.md'
- docs/**
- latest.json
repo:
- grafana/grafana
type: docker
@ -1640,7 +1634,6 @@ trigger:
exclude:
- '*.md'
- docs/**
- latest.json
repo:
- grafana/grafana
type: docker
@ -1714,7 +1707,6 @@ trigger:
exclude:
- '*.md'
- docs/**
- latest.json
repo:
- grafana/grafana
type: docker
@ -2114,7 +2106,6 @@ trigger:
exclude:
- '*.md'
- docs/**
- latest.json
repo:
- grafana/grafana
type: docker
@ -2344,7 +2335,6 @@ trigger:
exclude:
- '*.md'
- docs/**
- latest.json
repo:
- grafana/grafana
type: docker
@ -2399,7 +2389,6 @@ trigger:
exclude:
- '*.md'
- docs/**
- latest.json
repo:
- grafana/grafana
type: docker
@ -2445,7 +2434,6 @@ trigger:
exclude:
- '*.md'
- docs/**
- latest.json
repo:
- grafana/grafana-security-mirror
type: docker
@ -2486,7 +2474,6 @@ trigger:
exclude:
- '*.md'
- docs/**
- latest.json
repo:
- grafana/grafana
status:
@ -2887,7 +2874,6 @@ trigger:
- '*.md'
- docs/**
- packages/**/*.md
- latest.json
repo:
- grafana/grafana
type: docker
@ -4731,6 +4717,6 @@ kind: secret
name: gcr_credentials
---
kind: signature
hmac: 0fb0bf8e3d7ea206f4e58a70ae01017d1e113a1241e78da7dd38d25f894ec04d
hmac: e3875bd413d1eb9f9446b87eaee2d917d1548c4476e3047f09adc242ddf5868e
...

1
.github/CODEOWNERS vendored
View File

@ -361,7 +361,6 @@ lerna.json @grafana/frontend-ops
/.eslintrc @grafana/frontend-ops
/.vim @zoltanbedi
/jest.config.js @grafana/frontend-ops
/latest.json @grafana/frontend-ops
/metadata.md @grafana/plugins-platform
/stylelint.config.js @grafana/frontend-ops
/tools/ @grafana/frontend-ops

2
conf/defaults.ini
View File

@ -246,7 +246,7 @@ reporting_distributor = grafana-labs
# for new versions of grafana. The check is used
# in some UI views to notify that a grafana update exists.
# This option does not cause any auto updates, nor send any information
# only a GET request to https://raw.githubusercontent.com/grafana/grafana/main/latest.json to get the latest version.
# only a GET request to https://grafana.com/api/grafana/versions/stable to get the latest version.
check_for_updates = true
# Set to false to disable all checks to https://grafana.com

2
conf/sample.ini
View File

@ -253,7 +253,7 @@
# for new versions of grafana. The check is used
# in some UI views to notify that a grafana update exists.
# This option does not cause any auto updates, nor send any information
# only a GET request to https://raw.githubusercontent.com/grafana/grafana/main/latest.json to get the latest version.
# only a GET request to https://grafana.com/api/grafana/versions/stable to get the latest version.
;check_for_updates = true
# Set to false to disable all checks to https://grafana.com

27
pkg/services/updatechecker/grafana.go
View File

@ -20,7 +20,7 @@ import (
"github.com/grafana/grafana/pkg/setting"
)
const grafanaLatestJSONURL = "https://raw.githubusercontent.com/grafana/grafana/main/latest.json"
const grafanaStableVersionURL = "https://grafana.com/api/grafana/versions/stable"
type GrafanaService struct {
hasUpdate bool
@ -92,13 +92,13 @@ func (s *GrafanaService) instrumentedCheckForUpdates(ctx context.Context) {
func (s *GrafanaService) checkForUpdates(ctx context.Context) error {
ctxLogger := s.log.FromContext(ctx)
ctxLogger.Debug("Checking for updates")
req, err := http.NewRequestWithContext(ctx, http.MethodGet, grafanaLatestJSONURL, nil)
req, err := http.NewRequestWithContext(ctx, http.MethodGet, grafanaStableVersionURL, nil)
if err != nil {
return err
}
resp, err := s.httpClient.Do(req)
if err != nil {
return fmt.Errorf("failed to get latest.json repo from github.com: %w", err)
return fmt.Errorf("failed to get stable version from grafana.com: %w", err)
}
defer func() {
if err := resp.Body.Close(); err != nil {
@ -107,27 +107,24 @@ func (s *GrafanaService) checkForUpdates(ctx context.Context) error {
}()
body, err := io.ReadAll(resp.Body)
if err != nil {
return fmt.Errorf("update check failed, reading response from github.com: %w", err)
return fmt.Errorf("update check failed, reading response from grafana.com: %w", err)
}
type latestJSON struct {
Stable string `json:"stable"`
Testing string `json:"testing"`
type grafanaVersionJSON struct {
Version string `json:"version"`
}
var latest latestJSON
var latest grafanaVersionJSON
err = json.Unmarshal(body, &latest)
if err != nil {
return fmt.Errorf("failed to unmarshal latest.json: %w", err)
return fmt.Errorf("failed to unmarshal response from grafana.com: %w", err)
}
s.mutex.Lock()
defer s.mutex.Unlock()
if strings.Contains(s.grafanaVersion, "-") {
s.latestVersion = latest.Testing
s.hasUpdate = !strings.HasPrefix(s.grafanaVersion, latest.Testing)
} else {
s.latestVersion = latest.Stable
s.hasUpdate = latest.Stable != s.grafanaVersion
// only check for updates in stable versions
if !strings.Contains(s.grafanaVersion, "-") {
s.latestVersion = latest.Version
s.hasUpdate = latest.Version != s.grafanaVersion
}
currVersion, err1 := version.NewVersion(s.grafanaVersion)

1
scripts/drone/events/main.star
View File

@ -55,7 +55,6 @@ trigger = {
"exclude": [
"*.md",
"docs/**",
"latest.json",
],
},
"repo": [

1
scripts/drone/events/pr.star
View File

@ -62,7 +62,6 @@ trigger = {
"exclude": [
"*.md",
"docs/**",
"latest.json",
],
},
}

1
scripts/drone/pipelines/docs.star
View File

@ -24,7 +24,6 @@ docs_paths = {
"*.md",
"docs/**",
"packages/**/*.md",
"latest.json",
],
}

1
scripts/drone/pipelines/shellcheck.star
View File

@ -20,7 +20,6 @@ trigger = {
"exclude": [
"*.md",
"docs/**",
"latest.json",
],
"include": ["scripts/**/*.sh"],
},

1
scripts/drone/pipelines/trigger_downstream.star
View File

@ -20,7 +20,6 @@ trigger = {
"exclude": [
"*.md",
"docs/**",
"latest.json",
],
},
"repo": [

1
scripts/drone/rgm.star
View File

@ -55,7 +55,6 @@ docs_paths = {
"*.md",
"docs/**",
"packages/**/*.md",
"latest.json",
],
}