Repo Cleanup (#280)

Azure · Sep 20, 2022 · 421faa4 · 421faa4
1 parent dcd7b10
commit 421faa4
Show file tree

Hide file tree

Showing 69 changed files with 2 additions and 5,197 deletions.
diff --git a/.github/workflows/build-and-push-image-and-chart.yml b/.github/workflows/build-and-push-image-and-chart.yml
diff --git a/.github/workflows/deploy-to-prod.yml b/.github/workflows/deploy-to-prod.yml
diff --git a/.github/workflows/run-sdl-code-analysis-tools.yml b/.github/workflows/run-sdl-code-analysis-tools.yml
diff --git a/alerts/ci-prod-aks-mac-weu.json → internal/alerts/ci-prod-aks-mac-weu.json b/alerts/ci-prod-aks-mac-weu.json → internal/alerts/ci-prod-aks-mac-weu.json
diff --git a/alerts/ci-prod-aks-msi-eus2.json → internal/alerts/ci-prod-aks-msi-eus2.json b/alerts/ci-prod-aks-msi-eus2.json → internal/alerts/ci-prod-aks-msi-eus2.json
diff --git a/alerts/ci_prod_aks_eus.json → internal/alerts/ci_prod_aks_eus.json b/alerts/ci_prod_aks_eus.json → internal/alerts/ci_prod_aks_eus.json
diff --git a/otelcollector/docs/BUILDANDRELEASE.md → internal/docs/BUILDANDRELEASE.md b/otelcollector/docs/BUILDANDRELEASE.md → internal/docs/BUILDANDRELEASE.md
diff --git a/...lector/docs/test/CONFIGPROCESSINGTESTS.md → internal/docs/CONFIGPROCESSINGTESTS.md b/...lector/docs/test/CONFIGPROCESSINGTESTS.md → internal/docs/CONFIGPROCESSINGTESTS.md
diff --git a/otelcollector/docs/DEPENDENTCHARTS.md → internal/docs/DEPENDENTCHARTS.md b/otelcollector/docs/DEPENDENTCHARTS.md → internal/docs/DEPENDENTCHARTS.md
diff --git a/otelcollector/docs/perfscale/PERFTESTING.md → internal/docs/PERFTESTING.md b/otelcollector/docs/perfscale/PERFTESTING.md → internal/docs/PERFTESTING.md
@@ -95,11 +95,11 @@ The other necessary test is if the maximum volume of metrics that the agent can
 
 Note: This step is only necessary if making changes to the app. Otherwise, the yamls below will have the latest image.
 
-To build the reference app, go to the directory `cd otelcollector/referenceapp/<golang or python>` and run `docker build -f ./<linux or windows>/Dockerfile -t <your image tag> .` depending on which OS you want to build.
+To build the reference app, go to the directory `cd internal/referenceapp/<golang or python>` and run `docker build -f ./<linux or windows>/Dockerfile -t <your image tag> .` depending on which OS you want to build.
 
 ### Deploy the Reference App with Perf Mode Enabled
 
-Deploy the [linux reference app](../../referenceapp/prometheus-reference-app.yaml) or the [windows reference app](../../referenceapp/win-prometheus-reference-app.yaml) with `RUN_PERF_TEST` set to `true` to generate the specified number of metrics at a specified interval. Specify how many replicas should be scraped in the yaml spec. In the environment variables, set `SCRAPE_INTERVAL` to be an integer in seconds of how often the metrics should be generated. Set `METRIC_COUNT` to be the number of OTLP metrics to generate. Note that OTLP counts metrics by name. Multiply this by the number of timeseries of that metric to get the total number of timeseries that will be generated. For example, the reference app has 8 timeseries for the metric `myapp_temperature`. If we want 2,000,000 of these metrics to be generated every 15 seconds, the environment variables set in the yaml would be:
+Deploy the [linux reference app](../referenceapp/prometheus-reference-app.yaml) or the [windows reference app](../referenceapp/win-prometheus-reference-app.yaml) with `RUN_PERF_TEST` set to `true` to generate the specified number of metrics at a specified interval. Specify how many replicas should be scraped in the yaml spec. In the environment variables, set `SCRAPE_INTERVAL` to be an integer in seconds of how often the metrics should be generated. Set `METRIC_COUNT` to be the number of OTLP metrics to generate. Note that OTLP counts metrics by name. Multiply this by the number of timeseries of that metric to get the total number of timeseries that will be generated. For example, the reference app has 8 timeseries for the metric `myapp_temperature`. If we want 2,000,000 of these metrics to be generated every 15 seconds, the environment variables set in the yaml would be:
 
 ```yaml
 env:

diff --git a/otelcollector/referenceapp/golang/go.mod → internal/referenceapp/golang/go.mod b/otelcollector/referenceapp/golang/go.mod → internal/referenceapp/golang/go.mod
diff --git a/otelcollector/referenceapp/golang/go.sum → internal/referenceapp/golang/go.sum b/otelcollector/referenceapp/golang/go.sum → internal/referenceapp/golang/go.sum
diff --git a/...ctor/referenceapp/golang/linux/Dockerfile → ...rnal/referenceapp/golang/linux/Dockerfile b/...ctor/referenceapp/golang/linux/Dockerfile → ...rnal/referenceapp/golang/linux/Dockerfile
diff --git a/otelcollector/referenceapp/golang/main.go → internal/referenceapp/golang/main.go b/otelcollector/referenceapp/golang/main.go → internal/referenceapp/golang/main.go
diff --git a/...or/referenceapp/golang/windows/Dockerfile → ...al/referenceapp/golang/windows/Dockerfile b/...or/referenceapp/golang/windows/Dockerfile → ...al/referenceapp/golang/windows/Dockerfile
diff --git a/...tor/referenceapp/linux-scrape-config.yaml → ...nal/referenceapp/linux-scrape-config.yaml b/...tor/referenceapp/linux-scrape-config.yaml → ...nal/referenceapp/linux-scrape-config.yaml
diff --git a/...eferenceapp/prometheus-reference-app.yaml → ...eferenceapp/prometheus-reference-app.yaml b/...eferenceapp/prometheus-reference-app.yaml → ...eferenceapp/prometheus-reference-app.yaml
diff --git a/otelcollector/referenceapp/python/app.py → internal/referenceapp/python/app.py b/otelcollector/referenceapp/python/app.py → internal/referenceapp/python/app.py
diff --git a/...ctor/referenceapp/python/linux/Dockerfile → ...rnal/referenceapp/python/linux/Dockerfile b/...ctor/referenceapp/python/linux/Dockerfile → ...rnal/referenceapp/python/linux/Dockerfile
diff --git a/...or/referenceapp/python/windows/Dockerfile → ...al/referenceapp/python/windows/Dockerfile b/...or/referenceapp/python/windows/Dockerfile → ...al/referenceapp/python/windows/Dockerfile
diff --git a/...referenceapp/referance-app-dashboard.json → ...referenceapp/referance-app-dashboard.json b/...referenceapp/referance-app-dashboard.json → ...referenceapp/referance-app-dashboard.json
diff --git a/...enceapp/testTemplates/azure-pvc-disk.yaml → ...enceapp/testTemplates/azure-pvc-disk.yaml b/...enceapp/testTemplates/azure-pvc-disk.yaml → ...enceapp/testTemplates/azure-pvc-disk.yaml
diff --git a/...referenceapp/testTemplates/azure-pvc.yaml → ...referenceapp/testTemplates/azure-pvc.yaml b/...referenceapp/testTemplates/azure-pvc.yaml → ...referenceapp/testTemplates/azure-pvc.yaml
diff --git a/...ferenceapp/testTemplates/memory-leak.yaml → ...ferenceapp/testTemplates/memory-leak.yaml b/...ferenceapp/testTemplates/memory-leak.yaml → ...ferenceapp/testTemplates/memory-leak.yaml
diff --git a/...enceapp/win-prometheus-reference-app.yaml → ...enceapp/win-prometheus-reference-app.yaml b/...enceapp/win-prometheus-reference-app.yaml → ...enceapp/win-prometheus-reference-app.yaml
diff --git a/...r/referenceapp/windows-scrape-config.yaml → ...l/referenceapp/windows-scrape-config.yaml b/...r/referenceapp/windows-scrape-config.yaml → ...l/referenceapp/windows-scrape-config.yaml
diff --git a/tools/windowsExporterInstaller/README.md → internal/windowsExporterInstaller/README.md b/tools/windowsExporterInstaller/README.md → internal/windowsExporterInstaller/README.md
diff --git a/...Installer/windows-exporter-daemonset.yaml → ...Installer/windows-exporter-daemonset.yaml b/...Installer/windows-exporter-daemonset.yaml → ...Installer/windows-exporter-daemonset.yaml
diff --git a/otelcollector/build/linux/Dockerfile b/otelcollector/build/linux/Dockerfile
@@ -1,8 +1,6 @@
 FROM mcr.microsoft.com/mirror/docker/library/ubuntu:20.04
 LABEL description="Azure Monitor Prometheus metrics collector"
 LABEL maintainer="[email protected]"
-# ARG IMAGE_TAG="test"
-# ENV AGENT_VERSION ${IMAGE_TAG}
 ENV OS_TYPE "linux"
 ENV DEBIAN_FRONTEND=noninteractive
 ENV AZMON_COLLECT_ENV False

diff --git a/otelcollector/deploy/prometheus-collector-settings-configmap.yaml b/otelcollector/deploy/prometheus-collector-settings-configmap.yaml