Chore: Revert dskit service additions

[toddtreece]

What is this feature?

The current migration approach mixed use cases for dskit modules and services. One use case was for deployment mode targets, and the other allowed existing background services to be migrated to dskit services if there was a need to control startup order.

Mixing these two approaches will be too brittle long term due to the way wire dependencies are currently setup. A follow-up PR will focus the use case on only using dskit modules and services for the deployment mode use case.

Why do we need this feature?

[Add a description of the problem the feature is trying to solve.]

Who is this feature for?

@grafana/grafana-app-platform-squad

Which issue(s) does this PR fix?:

Fixes #

Special notes for your reviewer:

Please check that:

• It works as expected from a user's perspective.
• If this is a pre-GA feature, it is behind a feature toggle.
• The docs are updated, and if this is a notable improvement, it's added to our What's New doc.

[mildwonkey]

👍 LGTM

[toddtreece]

/deploy-to-hg

[ephemeral-instances-bot]

• Preparing your instance. A comment containing your instance's url will be added to this PR when the instance is ready.
• Your instance will be ready in ~10 minutes.
• Check the GitHub actions tab to follow the workflow progress
• Slack channel: #proj-ephemeral-hg-instances
• Building instance with toddtreece/remove-dskit-services oss branch and main enterprise branch. How to choose a branch

[ephemeral-instances-bot]

Error: Contact #proj-ephemeral-hg-instances if it is not a compile error

handling pull request comment event: running grafana-build package: executing command: stdout= stderr=go: downloading github.com/urfave/cli/v2 v2.24.4
go: downloading dagger.io/dagger v0.6.1
go: downloading golang.org/x/sync v0.2.0
go: downloading github.com/Masterminds/semver v1.5.0
go: downloading github.com/vektah/gqlparser/v2 v2.5.2-0.20230422221642-25e09f9d292d
go: downloading github.com/Khan/genqlient v0.6.0
go: downloading github.com/iancoleman/strcase v0.2.0
go: downloading github.com/adrg/xdg v0.4.0
go: downloading golang.org/x/tools v0.9.3
go: downloading github.com/cpuguy83/go-md2man/v2 v2.0.2
go: downloading github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673
go: downloading github.com/russross/blackfriday/v2 v2.1.0
go: downloading golang.org/x/mod v0.10.0
2023/08/02 19:35:34 Cloning Grafana...
2023/08/02 19:35:34 if git -C src checkout toddtreece/remove-dskit-services; then echo "checked out toddtreece/remove-dskit-services"; else exit 3; fi
2023/08/02 19:36:30 Cloning Grafana Enterprise...
2023/08/02 19:36:30 if git -C src checkout main; then echo "checked out main"; else exit 3; fi
2023/08/02 19:36:41 Creating Grafana backend build container for linux/amd64/dynamic on platform linux/amd64
2023/08/02 19:36:41 Building 'grafana' for linux/amd64/dynamic
2023/08/02 19:36:41 Building 'grafana' with env: 'map[CC:zig cc -target x86_64-linux-musl CGO_ENABLED:1 CXX:zig c++ -target x86_64-linux-musl GOARCH:amd64 GOEXPERIMENT: GOOS:linux]'
2023/08/02 19:36:41 Building 'grafana' with command: ' build -ldflags -X 'main.version=10.1.0' -X 'main.commit=7f30ced9ce' -X 'main.buildstamp=1691005001' -X 'main.buildBranch=toddtreece/remove-dskit-services' -o bin/linux/amd64/dynamic/grafana -tags pro -trimpath ./pkg/cmd/grafana'
2023/08/02 19:36:41 Building 'grafana-server' for linux/amd64/dynamic
2023/08/02 19:36:41 Building 'grafana-server' with env: 'map[CC:zig cc -target x86_64-linux-musl CGO_ENABLED:1 CXX:zig c++ -target x86_64-linux-musl GOARCH:amd64 GOEXPERIMENT: GOOS:linux]'
2023/08/02 19:36:41 Building 'grafana-server' with command: ' build -ldflags -X 'main.version=10.1.0' -X 'main.commit=7f30ced9ce' -X 'main.buildstamp=1691005001' -X 'main.buildBranch=toddtreece/remove-dskit-services' -o bin/linux/amd64/dynamic/grafana-server -tags pro -trimpath ./pkg/cmd/grafana-server'
2023/08/02 19:36:41 Building 'grafana-cli' for linux/amd64/dynamic
2023/08/02 19:36:41 Building 'grafana-cli' with env: 'map[CC:zig cc -target x86_64-linux-musl CGO_ENABLED:1 CXX:zig c++ -target x86_64-linux-musl GOARCH:amd64 GOEXPERIMENT: GOOS:linux]'
2023/08/02 19:36:41 Building 'grafana-cli' with command: ' build -ldflags -X 'main.version=10.1.0' -X 'main.commit=7f30ced9ce' -X 'main.buildstamp=1691005001' -X 'main.buildBranch=toddtreece/remove-dskit-services' -o bin/linux/amd64/dynamic/grafana-cli -tags pro -trimpath ./pkg/cmd/grafana-cli'
2023/08/02 19:39:04 Writing package grafana-pro_10.1.0_12345_linux_amd64-dynamic.tar.gz to file://dist/grafana-pro_10.1.0_12345_linux_amd64-dynamic.tar.gz
2023/08/02 19:39:04 [file://dist/grafana-pro_10.1.0_12345_linux_amd64-dynamic.tar.gz] Attempting to publish file
2023/08/02 19:39:04 [file://dist/grafana-pro_10.1.0_12345_linux_amd64-dynamic.tar.gz] Acquiring semaphore
2023/08/02 19:39:04 [file://dist/grafana-pro_10.1.0_12345_linux_amd64-dynamic.tar.gz] Acquired semaphore
2023/08/02 19:39:04 [file://dist/grafana-pro_10.1.0_12345_linux_amd64-dynamic.tar.gz] Publishing file
2023/08/02 19:39:04 Publishing file://dist/grafana-pro_10.1.0_12345_linux_amd64-dynamic.tar.gz
2023/08/02 19:43:50 [file://dist/grafana-pro_10.1.0_12345_linux_amd64-dynamic.tar.gz] error: input:1: container.from.withExec.withExec.withMountedDirectory.withWorkdir.withExec.withEnvVariable.withEnvVariable.withEnvVariable.withEnvVariable.withEnvVariable.withEnvVariable.withEnvVariable.withEnvVariable.withExec.withExec.withExec.directory process "go build -ldflags -X 'main.version=10.1.0' -X 'main.commit=7f30ced9ce' -X 'main.buildstamp=1691005001' -X 'main.buildBranch=toddtreece/remove-dskit-services' -o bin/linux/amd64/dynamic/grafana -tags pro -trimpath ./pkg/cmd/grafana" did not complete successfully: exit code: 1
Stdout:

Stderr:
go: downloading github.com/urfave/cli/v2 v2.25.0
go: downloading github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673

github.com/grafana/grafana/pkg/extensions/provisioning/service

pkg/extensions/provisioning/service/service.go:35:96: undefined: modules.Provisioning

Please visit https://dagger.io/help#go for troubleshooting guidance.
exit status 1
exit status 1

[toddtreece]

/deploy-to-hg --enterprise-ref toddtreece/remove-dskit-services

[ephemeral-instances-bot]

• Preparing your instance. A comment containing your instance's url will be added to this PR when the instance is ready.
• Your instance will be ready in ~10 minutes.
• Check the GitHub actions tab to follow the workflow progress
• Slack channel: #proj-ephemeral-hg-instances
• Building instance with toddtreece/remove-dskit-services oss branch and toddtreece/remove-dskit-services enterprise branch. How to choose a branch

[ephemeral-instances-bot]

• Your instance can be accessed at: https://ephemeral1511182172608toddtre.grafana-dev.net
• The instance is not using the CDN assets.
• How to access / How to update instance config / How to choose build a specific branch