feat: add ability to launch targeted dskit modules in the grafana server CLI command #74188
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mildwonkey
force-pushed
the
mildwonkey/module-server
branch
from
e680a8a
to
be72cdf
Compare
mildwonkey
added
no-backport
mildwonkey
force-pushed
the
mildwonkey/module-server
branch
from
be72cdf
to
8eb48ea
Compare
mildwonkey
commented
Aug 31, 2023
| @@ -325,7 +328,6 @@ var wireBasicSet = wire.NewSet( | |||
| grpcserver.ProvideHealthService, | |||
| grpcserver.ProvideReflectionService, | |||
| interceptors.ProvideAuthenticator, | |||
| setting.NewCfgFromArgs, | |||
There was a problem hiding this comment.
This "dependency" only exists so wire can handle calling that method on the setting.CommandLineArgs, so I refactored the various Initialize commands to take a setting.Cfg and made sure we were calling setting.NewCfgFromArgs explicitly where needed.
This does not change the setting.Provider (oss & enterprise both); that is a more idiomatic dependency.
It's an unexpected, free baby step towards refactoring setting.Cfg!!
mildwonkey
requested review from
papagian,
suntala and
yangkb09
and removed request for
a team
…ver CLI command This commit adds a ModuleServer and ModuleRunner suitable for launching dskit services and updates the server cli command to use this instead of the full Server. The default behavior is unchanged and will launch the full Grafana server. Individual services are targeted by setting target=comma,seperated,list in the config file.
…th calling setting.NewCfg
mildwonkey
force-pushed
the
mildwonkey/module-server
branch
from
625ddba
to
99eff61
Compare
|
/deploy-to-hg --enterprise-ref mildwonkey/module-server |
|
|
zserge
reviewed
Aug 31, 2023
zserge
approved these changes
Aug 31, 2023
Co-authored-by: Serge Zaitsev <serge.zaitsev@grafana.com>
This was referenced Sep 5, 2023
Merged
chauchausoup
pushed a commit
to chauchausoup/grafana
that referenced
this pull request
Sep 15, 2023
…ver CLI command (grafana#74188) * feat: add ability to launch targeted dskit modules in the grafana server CLI command This commit adds a ModuleServer and ModuleRunner suitable for launching dskit services and updates the server cli command to use this instead of the full Server. The default behavior is unchanged and will launch the full Grafana server. Individual services are targeted by setting target=comma,seperated,list in the config file. * require dev mode to target dskit modules * remove unused type * replace setting.CommandLineArgs w/setting.Cfg; the caller can deal with calling setting.NewCfg * Update pkg/server/module_server.go Co-authored-by: Serge Zaitsev <serge.zaitsev@grafana.com> --------- Co-authored-by: Serge Zaitsev <serge.zaitsev@grafana.com>
rwwiv
pushed a commit
that referenced
this pull request
Oct 2, 2023
…ver CLI command (#74188) * feat: add ability to launch targeted dskit modules in the grafana server CLI command This commit adds a ModuleServer and ModuleRunner suitable for launching dskit services and updates the server cli command to use this instead of the full Server. The default behavior is unchanged and will launch the full Grafana server. Individual services are targeted by setting target=comma,seperated,list in the config file. * require dev mode to target dskit modules * remove unused type * replace setting.CommandLineArgs w/setting.Cfg; the caller can deal with calling setting.NewCfg * Update pkg/server/module_server.go Co-authored-by: Serge Zaitsev <serge.zaitsev@grafana.com> --------- Co-authored-by: Serge Zaitsev <serge.zaitsev@grafana.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit adds a ModuleServer and ModuleRunner suitable for launching dskit services and updates the server cli command to use this instead of the full Server. The default behavior is unchanged and will launch the full Grafana server. Individual services are targeted by setting target=comma,seperated,list in the config file.
TODO
I recommend y'all try it out yourselves, but here's the output if I set a
targetin my config file but run the CLI in anything other than dev mode: