-
Notifications
You must be signed in to change notification settings - Fork 158
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Tanzu Tile implementation and documentation (#2726)
Tanzu Tile implementation and docs This change implements the required code for creating the Tanzu Tile. The Tanzu Tile is a way to deploy the collector to get metrics from the Tanzu environment. In the tile directory, run the command ./make-latest-tile to generate the Tanzu tile. Refer to DEVELOPMENT.md to know how to properly use the created tile.
- Loading branch information
Showing
22 changed files
with
547 additions
and
75 deletions.
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
name: Tanzu Tile | ||
|
||
# The workflow triggered by any change in deployments/cloudfoundry/bosh/ | ||
# or /deployments/cloudfoundry/tile | ||
|
||
on: | ||
pull_request: | ||
paths: | ||
- 'deployments/cloudfoundry/bosh/**' | ||
- 'deployments/cloudfoundry/tile/**' | ||
|
||
permissions: | ||
contents: write | ||
|
||
defaults: | ||
run: | ||
working-directory: 'deployments/cloudfoundry/tile' | ||
|
||
jobs: | ||
|
||
test: | ||
name: Test Tanzu Tile creation | ||
# Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved | ||
runs-on: ubuntu-20.04 | ||
steps: | ||
- name: Check out the codebase. | ||
uses: actions/checkout@v3 | ||
- name: Set up Homebrew | ||
id: set-up-homebrew | ||
uses: Homebrew/actions/setup-homebrew@master | ||
- name: Install BOSH CLI | ||
shell: bash | ||
run: | | ||
brew install cloudfoundry/tap/bosh-cli | ||
bosh -v | ||
- name: Install PCF CLI | ||
shell: bash | ||
run: | | ||
pip install tile-generator | ||
- name: Run release script | ||
shell: bash | ||
run: | | ||
./make-latest-tile | ||
tanzu_tile_regex="product/splunk-otel-collector-*.pivotal" | ||
size="$(stat -c '%s' $tanzu_tile_regex)" | ||
if [[ $size -eq 0 ]]; then | ||
echo "File is empty!" >&2 | ||
exit 1 | ||
fi | ||
tanzu_tile_path=$(pwd)/$tanzu_tile_regex | ||
echo "tanzu_tile_path=$tanzu_tile_path" >> $GITHUB_ENV | ||
- name: Uploading artifacts | ||
uses: actions/upload-artifact@v3 | ||
with: | ||
name: tanzu-tile-latest.pivotal | ||
path: ${{ env.tanzu_tile_path }} |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,25 @@ | ||
# Splunk OpenTelemetry Collector Pivotal Cloud Foundry (PCF) Integrations | ||
|
||
Supported Tanzu Application Service (TAS) versions: v2 | ||
|
||
Unsupported TAS versions: v3 | ||
|
||
### Cloud Foundry Buildpack | ||
|
||
This integration can be used to install and run the Collector as a sidecar to your app. | ||
In this configuration, the Collector will run in the same container as the app. | ||
|
||
### Bosh Release | ||
|
||
This is a Bosh release of the Splunk Collector. This deploys the Collector to the PCF | ||
environment as a standalone deployment. | ||
This is a Bosh release of the Collector. This deploys the Collector to the PCF | ||
environment as a standalone deployment. | ||
|
||
### Tanzu Tile | ||
|
||
This is a Tanzu Tile of the Collector, which is a packaged release of the collector | ||
that can be integrated into the Ops Manager. The Tanzu Tile enables users to download, install, | ||
run, configure, and update the collector all from the Ops Manager. | ||
|
||
[Tanzu Tile UI](./tile/resources/tanzu_tile_in_ops_mgr.png) | ||
|
||
[Tanzu Tile Configuration UI](./tile/resources/tanzu_tile_config_options.png) |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
latest-release.tgz | ||
signalfx-agent.tar.gz | ||
splunk_otel_collector | ||
.dev_builds | ||
blobs | ||
dev_releases | ||
dev_releases | ||
bosh-env |
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
# Copyright Splunk Inc. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
# Explicitly define the shell we will use for commands. | ||
SHELL?=/bin/bash | ||
|
||
.DEFAULT_GOAL=install-director | ||
|
||
.PHONY: delete-director | ||
delete-director: | ||
./delete-director.sh | ||
|
||
.PHONY: install-director | ||
install-director: | ||
./install-director.sh | ||
|
||
.PHONY: reinstall-director | ||
reinstall-director: delete-director install-director |
This file was deleted.
Oops, something went wrong.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
# Copyright Splunk Inc. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
#!/bin/bash | ||
|
||
set -euo pipefail | ||
|
||
BOSH_DIRECTOR_DIR="./bosh-env/virtualbox" | ||
BOSH_DIRECTOR_DEPLOYMENT_DIR="bosh-deployment" | ||
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" | ||
|
||
if [ -d $BOSH_DIRECTOR_DIR ] && [ -d $BOSH_DIRECTOR_DIR/$BOSH_DIRECTOR_DEPLOYMENT_DIR ]; then | ||
cd $BOSH_DIRECTOR_DIR | ||
./$BOSH_DIRECTOR_DEPLOYMENT_DIR/virtualbox/delete-env.sh | ||
cd $SCRIPT_DIR | ||
rm -rf $BOSH_DIRECTOR_DIR | ||
fi |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
# Copyright Splunk Inc. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
#!/bin/bash | ||
|
||
set -euo pipefail | ||
|
||
BOSH_DIRECTOR_DIR="./bosh-env/virtualbox" | ||
BOSH_DIRECTOR_DEPLOYMENT_DIR="bosh-deployment" | ||
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" | ||
|
||
if [ -d $BOSH_DIRECTOR_DIR/$BOSH_DIRECTOR_DEPLOYMENT_DIR ]; then | ||
echo "Bosh director already exists" | ||
echo "If you want to build again, run make reinstall-director" | ||
exit 0 | ||
fi | ||
|
||
mkdir -p $BOSH_DIRECTOR_DIR | ||
cd $BOSH_DIRECTOR_DIR | ||
|
||
git clone --depth 1 https://github.com/cloudfoundry/bosh-deployment.git | ||
|
||
./$BOSH_DIRECTOR_DEPLOYMENT_DIR/virtualbox/create-env.sh | ||
|
||
source .envrc | ||
bosh -e vbox env | ||
|
||
bosh -e vbox update-cloud-config bosh-deployment/warden/cloud-config.yml | ||
bosh upload-stemcell --sha1 d44dc2d1b3f8415b41160ad4f82bc9d30b8dfdce \ | ||
https://bosh.io/d/stemcells/bosh-warden-boshlite-ubuntu-bionic-go_agent?v=1.71 | ||
|
||
cd $SCRIPT_DIR |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,7 +8,6 @@ templates: | |
|
||
packages: | ||
- splunk_otel_collector | ||
- signalfx_agent | ||
|
||
properties: | ||
|
||
|
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
16 changes: 0 additions & 16 deletions
16
deployments/cloudfoundry/bosh/packages/signalfx_agent/packaging
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.