Merge pull request #7 from jjo/jjo/reorg-lib

compose: reorg lib

Author: jjo

2024/2024-10-23--Grafana_n_Friends-Jugando_con_eBPF_en_Linux-Oct2024/40-beyla/compose.jsonnet

@@ -1,44 +1,38 @@
 // main.jsonnet
+local c = import 'lib/containers/main.libsonnet';
 local compose = import 'lib/docker_compose.libsonnet';
 
-local beyla = import 'lib/beyla.libsonnet';
-local generic = import 'lib/generic.libsonnet';
-local grafana = import 'lib/grafana.libsonnet';
-local loki = import 'lib/loki.libsonnet';
-local prometheus = import 'lib/prometheus.libsonnet';
-local promtail = import 'lib/promtail.libsonnet';
-
 compose.new({
   local this = self,
   simplesrv:
-    generic.new('simplesrv', 8080)
-    + generic.withBuild('simplesrv/'),
+    c.generic.new('simplesrv', 8080)
+    + c.generic.withBuild('simplesrv/'),
   prometheus:
-    prometheus.new()
-    + prometheus.withVolume()
-    + prometheus.withTargets([this.beyla]),
+    c.prometheus.new()
+    + c.prometheus.withVolume()
+    + c.prometheus.withTargets([this.beyla]),
   loki:
-    loki.new()
-    + loki.withVolume(),
+    c.loki.new()
+    + c.loki.withVolume(),
   grafana:
-    grafana.new()
-    + grafana.withVolume()
-    + grafana.withDatasources([
-      grafana.datasource.withPrometheus(this.prometheus, true),
-      grafana.datasource.withLoki(this.loki),
+    c.grafana.new()
+    + c.grafana.withVolume()
+    + c.grafana.withDatasources([
+      c.grafana.datasource.withPrometheus(this.prometheus, true),
+      c.grafana.datasource.withLoki(this.loki),
     ])
     + compose.withDependsOn([this.prometheus, this.loki]),
   beyla:
-    beyla.new()
-    + beyla.withContainerPid(this.simplesrv),
+    c.beyla.new()
+    + c.beyla.withContainerPid(this.simplesrv),
   promtail:
-    promtail.new()
-    + promtail.withDockerLogs()
-    + promtail.withLokiPush(this.loki)
+    c.promtail.new()
+    + c.promtail.withDockerLogs()
+    + c.promtail.withLokiPush(this.loki)
     + compose.withDependsOn([this.loki]),
-  k6: generic.new('k6')
-      + generic.withImage('loadimpact/k6:latest')
-      + generic.withLocalVolume('./k6/load_test.js', '/k6/load_test.js')
-      + generic.withField('restart', 'unless-stopped')
-      + generic.withCommand('run --out json /k6/load_test.js'),
+  k6: c.generic.new('k6')
+      + c.generic.withImage('loadimpact/k6:latest')
+      + c.generic.withLocalVolume('./k6/load_test.js', '/k6/load_test.js')
+      + c.generic.withField('restart', 'unless-stopped')
+      + c.generic.withCommand('run --out json /k6/load_test.js'),
 })

2024/2024-10-25--Promtail_syslog-Loki-Grafana/compose.jsonnet

@@ -1,33 +1,28 @@
 // main.jsonnet
+local c = import 'lib/containers/main.libsonnet';
 local compose = import 'lib/docker_compose.libsonnet';
 
-local beyla = import 'lib/beyla.libsonnet';
-local grafana = import 'lib/grafana.libsonnet';
-local loki = import 'lib/loki.libsonnet';
-local prometheus = import 'lib/prometheus.libsonnet';
-local promtail = import 'lib/promtail.libsonnet';
-
 compose.new({
   local this = self,
   prometheus:
-    prometheus.new()
-    + prometheus.withVolume()
-    + prometheus.withTargets([this.prometheus, this.loki, this.promtail, this.grafana]),
+    c.prometheus.new()
+    + c.prometheus.withVolume()
+    + c.prometheus.withTargets([this.prometheus, this.loki, this.promtail, this.grafana]),
   loki:
-    loki.new()
-    + loki.withVolume(),
+    c.loki.new()
+    + c.loki.withVolume(),
   grafana:
-    grafana.new()
-    + grafana.withVolume()
-    + grafana.withDatasources([
-      grafana.datasource.withPrometheus(this.prometheus, true),
-      grafana.datasource.withLoki(this.loki),
+    c.grafana.new()
+    + c.grafana.withVolume()
+    + c.grafana.withDatasources([
+      c.grafana.datasource.withPrometheus(this.prometheus, true),
+      c.grafana.datasource.withLoki(this.loki),
     ])
     + compose.withDependsOn([this.prometheus, this.loki]),
   promtail:
-    promtail.new()
-    + promtail.withSyslog()
-    + promtail.withDockerLogs()
-    + promtail.withLokiPush(this.loki)
+    c.promtail.new()
+    + c.promtail.withSyslog()
+    + c.promtail.withDockerLogs()
+    + c.promtail.withLokiPush(this.loki)
     + compose.withDependsOn([this.loki]),
 })

compose/jsonnet/lib/beyla.libsonnet renamed to compose/jsonnet/lib/containers/beyla/main.libsonnet

@@ -1,5 +1,5 @@
 // lib/beyla.libsonnet
-local images = import 'images.libsonnet';
+local images = import '../images.libsonnet';
 
 {
   new(name='beyla', port=9400):: {