All in one (#88)

digma-ai · Nov 15, 2023 · 89f298d · 89f298d
2 parents 4b7cbec + cc35f9f
commit 89f298d
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 116 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -28,7 +28,7 @@ LABEL org.opencontainers.image.title="Digma Continuous Feedback" \
     com.docker.extension.detailed-description="<h3>Continuous Feedback for Code</h3><a href="https://www.producthunt.com/posts/digma-ai?utm_source=badge-featured&utm_medium=badge&utm_souce=badge-digma&#0045;ai"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=416271&theme=light"  width="250" height="54" /></a><p>Digma collects data from applications running locally or inside your containers and lints their runtime behavior. It is able to find issues, code smells, performance degradations and provide more context to making risky changes.</p><p>The Digma IDE plugin is an <a href="https://digma.ai/blog/introducing-the-digma-jetbrains-plugin/">IntelliJ plugin</a> that provides detailed information in your code itself as <a href="https://digma.ai/blog/ci-cd-cf-the-devops-toolchains-missing-link/">Continuous Feedback</a> for developers who can explore hidden issues and design better applications. Digma provides tracing visualization using <a href="https://digma.ai/blog/jaeger-distributed-tracing-with-java-an-introduction/">Jaeger</a> and shows linting highlights, advanced insights and even live data.</p><p>Digma currently supports Java applications with additional coding languages to be added soon.</p>" \
     com.docker.extension.publisher-url="https://digma.ai" \
     com.docker.extension.additional-urls="[{\"alt\": \"Digma\", \"title\":\"Digma Runtime Linter\", \"url\": \"https://digma.ai\"},{\"alt\": \"Digma Slack Group\", \"title\":\" Continous Feedback Slack Channel\", \"url\": \"https://join.slack.com/t/continuous-feedback/shared_invite/zt-1hk5rbjow-yXOIxyyYOLSXpCZ4RXstgA\"},{\"alt\": \"Digma IntelliJ Plugin\", \"title\":\"Jetbrain IDEA Plugin\", \"url\": \"https://plugins.jetbrains.com/plugin/19470-digma-continuous-feedback\"}]" \
-    com.docker.extension.changelog="<p>Extension changelog<ul><li>Bug fixes</li><li>Backend version bump to 0.2.166</li></ul></p>" \
+    com.docker.extension.changelog="<p>Extension changelog<ul><li>Bug fixes</li><li>Backend version bump to 0.2.171</li></ul></p>" \
     com.docker.desktop.extension.icon="https://media-public-1.s3.eu-west-1.amazonaws.com/digma.svg" \
     com.docker.extension.categories="cloud-development,testing-tools"
 

diff --git a/backend/server.js b/backend/server.js
@@ -6,7 +6,7 @@ const { AnalyticsProvider } = require("./analyticsProvider");
 var app = express();
 app.use(express.json());
 
-var analyticsProvider = new AnalyticsProvider("https://digma-analytics:5051");
+var analyticsProvider = new AnalyticsProvider("https://digma-compound:5051");
 
 app.get("/environments", async function (req, res) {
   try {

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -109,127 +109,43 @@ services:
     ports:
       - "5280:80"
     environment:
-      - PLUGIN_API_URL=https://${PLUGIN_API_URL:-digma-analytics}:5051
+      - PLUGIN_API_URL=https://${PLUGIN_API_URL:-digma-compound}:5051
     depends_on:
-      - digma-analytics
+      - digma-compound
     restart: unless-stopped
 
-  digma-collector-api:
-    image: digmatic/digma-collector:0.2.166
+  digma-compound:
+    image: digmatic/digma-compound:0.2.171
     ports:
-      - "5050:5050"
+    - "5049:5049"
+    - "5050:5050"
+    - "5051:5051"
     environment:
-      - CacheSettings__RedisConnection=${REDIS_CONNECTION:-redis}
-      - ConnectionStrings__Postgres=Server=${POSTGRES_SERVER:-postgres};Port=${POSTGRES_SERVER_PORT:-5432};Database=digma_analytics;User Id=${POSTGRES_USER:-postgres};Password=${POSTGRES_PWD:-postgres};
-      - RabbitMq__Host=${RabbitMq_Host:-rabbitmq}
-      - RabbitMq__Username=${RabbitMq_Username:-admin}
-      - RabbitMq__Password=${RabbitMq_Password:-admin}
-      - OtlpExporterUrl=
-      - ApplicationVersion=0.2.166
+    - BACKEND_DEPLOYMENT_TYPE=DockerExtension
+    - CacheSettings__RedisConnection=${REDIS_CONNECTION:-redis}
+    - ConnectionStrings__Postgres=Server=${POSTGRES_SERVER:-postgres};Port=${POSTGRES_SERVER_PORT:-5432};Database=digma-compound;User Id=${POSTGRES_USER:-postgres};Password=${POSTGRES_PWD:-postgres};
+    - RabbitMq__Host=${RabbitMq_Host:-rabbitmq}
+    - RabbitMq__Username=${RabbitMq_Username:-admin}
+    - RabbitMq__Password=${RabbitMq_Password:-admin}
+    - influx2__Url=http://${INFLUXDB_URL:-influxdb}:8086
+    - Ds__Url=http://${DS_URL:-digma-ds}:5054
+    - Ds__TimeoutInSeconds=0.2
+    - OtlpExporterUrl=
+    - Kafka__Urls__0=kafka:9092
+    - Jaeger__OtlpUrl=http://jaeger:4317
+    - ThresholdOptions__RecentActivityUpdateThresholdSeconds=5
+    - ThresholdOptions__UpsertEndpointThresholdSeconds=5
+    - ThresholdOptions__UpsertSpanFlowMetadataThresholdSeconds=5
+    - ThresholdOptions__UpsertSpansThresholdSeconds=5
+    - GlobalExceptionSettings__ExposeInternalDetails=true
+    - ApplicationVersion=0.2.171
     depends_on:
-      - rabbitmq
+    - redis
+    - rabbitmq
+    - postgres
+    - influxdb
+    - kafka
     restart: unless-stopped
-
-  digma-collector-worker:
-    image: digmatic/digma-collector-worker:0.2.166
-    environment:
-      - CacheSettings__RedisConnection=${REDIS_CONNECTION:-redis}
-      - ConnectionStrings__Postgres=Server=${POSTGRES_SERVER:-postgres};Port=${POSTGRES_SERVER_PORT:-5432};Database=digma_analytics;User Id=${POSTGRES_USER:-postgres};Password=${POSTGRES_PWD:-postgres};
-      - influx2__Url=http://${INFLUXDB_URL:-influxdb}:8086
-      - RabbitMq__Host=${RabbitMq_Host:-rabbitmq}
-      - RabbitMq__Username=${RabbitMq_Username:-admin}
-      - RabbitMq__Password=${RabbitMq_Password:-admin}
-      - OtlpExporterUrl=
-      - ApplicationVersion=0.2.166
-      - Jaeger__OtlpUrl=http://jaeger:4317
-      - BACKEND_DEPLOYMENT_TYPE=DockerExtension
-      - Kafka__Urls__0=kafka:9092
-      - ThresholdOptions__RecentActivityUpdateThresholdSeconds=5
-      - ThresholdOptions__UpsertEndpointThresholdSeconds=5
-      - ThresholdOptions__UpsertSpanFlowMetadataThresholdSeconds=5
-      - ThresholdOptions__UpsertSpansThresholdSeconds=5
-    depends_on:
-      - redis
-      - influxdb
-      - rabbitmq
-    restart: unless-stopped
-
-  digma-analytics:
-    image: digmatic/digma-analytics:0.2.166
-    ports:
-      - "5051:5051"
-    environment:
-      - influx2__Url=http://${INFLUXDB_URL:-influxdb}:8086
-      - CollectorUrl=http://${COLLECTOR_URL:-digma-collector-api}:5049
-      - ConnectionStrings__Postgres=Server=${POSTGRES_SERVER:-postgres};Port=${POSTGRES_SERVER_PORT:-5432};Database=digma_analytics;User Id=${POSTGRES_USER:-postgres};Password=${POSTGRES_PWD:-postgres};
-      - CacheSettings__RedisConnection=${REDIS_CONNECTION:-redis}
-      - GlobalExceptionSettings__ExposeInternalDetails=true
-      - BACKEND_DEPLOYMENT_TYPE=DockerExtension
-      - OtlpExporterUrl=
-      - ApplicationVersion=0.2.166
-    depends_on:
-      - influxdb
-      - postgres
-      - redis
-    restart: unless-stopped
-
-  digma-scheduler:
-    image: digmatic/digma-scheduler:0.2.166
-    environment:
-      - influx2__Url=http://${INFLUXDB_URL:-influxdb}:8086
-      - ConnectionStrings__Postgres=Server=${POSTGRES_SERVER:-postgres};Port=${POSTGRES_SERVER_PORT:-5432};Database=digma_analytics;User Id=${POSTGRES_USER:-postgres};Password=${POSTGRES_PWD:-postgres};
-      - RabbitMq__Host=${RabbitMq_Host:-rabbitmq}
-      - RabbitMq__Username=${RabbitMq_Username:-admin}
-      - RabbitMq__Password=${RabbitMq_Password:-admin}
-      - CacheSettings__RedisConnection=${REDIS_CONNECTION:-redis}
-      - OtlpExporterUrl=
-      - ApplicationVersion=0.2.166
-      - BACKEND_DEPLOYMENT_TYPE=DockerCompose
-    depends_on:
-      - influxdb
-      - postgres
-      - rabbitmq
-    restart: unless-stopped
-
-  digma-measurement-analysis:
-    image: digmatic/digma-measurement-analysis:0.2.166
-    environment:
-      - influx2__Url=http://${INFLUXDB_URL:-influxdb}:8086
-      - ConnectionStrings__Postgres=Server=${POSTGRES_SERVER:-postgres};Port=${POSTGRES_SERVER_PORT:-5432};Database=digma_analytics;User Id=${POSTGRES_USER:-postgres};Password=${POSTGRES_PWD:-postgres};
-      - RabbitMq__Host=${RabbitMq_Host:-rabbitmq}
-      - RabbitMq__Username=${RabbitMq_Username:-admin}
-      - RabbitMq__Password=${RabbitMq_Password:-admin}
-      - CacheSettings__RedisConnection=${REDIS_CONNECTION:-redis}
-      - OtlpExporterUrl=
-      - ApplicationVersion=0.2.166
-      - Kafka__Urls__0=kafka:9092
-      - Ds__Url=http://${DS_URL:-digma-ds}:5054
-    depends_on:
-      - influxdb
-      - postgres
-      - rabbitmq
-      - jaeger
-    restart: unless-stopped
-
-  digma-insight-analysis:
-    image: digmatic/digma-insight-analysis:0.2.166
-    environment:
-      - influx2__Url=http://${INFLUXDB_URL:-influxdb}:8086
-      - ConnectionStrings__Postgres=Server=${POSTGRES_SERVER:-postgres};Port=${POSTGRES_SERVER_PORT:-5432};Database=digma_analytics;User Id=${POSTGRES_USER:-postgres};Password=${POSTGRES_PWD:-postgres};
-      - RabbitMq__Host=${RabbitMq_Host:-rabbitmq}
-      - RabbitMq__Username=${RabbitMq_Username:-admin}
-      - RabbitMq__Password=${RabbitMq_Password:-admin}
-      - CacheSettings__RedisConnection=${REDIS_CONNECTION:-redis}
-      - OtlpExporterUrl=
-      - ApplicationVersion=0.2.166
-      - Jaeger__OtlpUrl=http://jaeger:4317
-    depends_on:
-      - influxdb
-      - postgres
-      - rabbitmq
-      - jaeger
-    restart: unless-stopped
-
 volumes:
   rabbitmq_data:
   rabbitmq_log: