Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

cmd(server): add support for grafana-wrapper#11612

Closed
bobheadxi wants to merge 4 commits into
masterfrom
distribution/single-container-grafana
Closed

cmd(server): add support for grafana-wrapper#11612
bobheadxi wants to merge 4 commits into
masterfrom
distribution/single-container-grafana

Conversation

@bobheadxi

@bobheadxi bobheadxi commented Jun 22, 2020

Copy link
Copy Markdown
Member

closes https://github.com/sourcegraph/sourcegraph/issues/11473

This PR updates sourcegraph/server to use the entrypoint and new grafana-wrapper, enabling support for the new site alerts configuration in single-container deployments

VERSION=dev IMAGE=sourcegraph/server:dev cmd/server/build.sh
IMAGE=sourcegraph/server:dev dev/run-server-image.sh

As a result of this, I've also removed the grafana-single-container.ini configuration

@bobheadxi bobheadxi requested a review from emidoots as a code owner June 22, 2020 05:40
@bobheadxi bobheadxi requested a review from a team June 22, 2020 05:40
@bobheadxi bobheadxi requested a review from a team as a code owner June 22, 2020 05:40
@codecov

codecov Bot commented Jun 22, 2020

Copy link
Copy Markdown

Codecov Report

Merging #11612 into master will increase coverage by 0.08%.
The diff coverage is 0.00%.

@@            Coverage Diff             @@
##           master   #11612      +/-   ##
==========================================
+ Coverage   47.44%   47.53%   +0.08%     
==========================================
  Files        1404     1402       -2     
  Lines       79706    79486     -220     
  Branches     6816     6775      -41     
==========================================
- Hits        37817    37784      -33     
+ Misses      38310    38127     -183     
+ Partials     3579     3575       -4     
Flag Coverage Δ
#go 51.73% <0.00%> (+0.13%) ⬆️
#storybook 10.12% <ø> (ø)
#typescript 36.42% <ø> (ø)
#unit 47.13% <0.00%> (+0.08%) ⬆️
Impacted Files Coverage Δ
cmd/frontend/internal/app/debug.go 0.96% <ø> (+0.02%) ⬆️
cmd/server/shared/monitoring.go 0.00% <0.00%> (ø)
...cker-images/grafana/cmd/grafana-wrapper/grafana.go 0.00% <0.00%> (-4.00%) ⬇️
.../internal/codeintel/resolvers/graphql/locations.go 80.18% <0.00%> (-1.89%) ⬇️
docker-images/grafana/cmd/grafana-wrapper/main.go 0.00% <0.00%> (ø)
docker-images/grafana/cmd/grafana-wrapper/site.go 0.00% <0.00%> (ø)
...ages/grafana/cmd/grafana-wrapper/grafana_change.go
docker-images/grafana/cmd/grafana-wrapper/smtp.go
...er-images/grafana/cmd/grafana-wrapper/notifiers.go 76.92% <0.00%> (+8.03%) ⬆️

@bobheadxi

Copy link
Copy Markdown
Member Author

Converting the draft for now due to change in plans: https://github.com/sourcegraph/sourcegraph/issues/11452#issuecomment-648652514 (will close when I have a new PR up)

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

monitoring: update sourcegraph/server to use prom-wrapper

1 participant