refactor: moved jaeger-agent-mixin (#2377)

* refactor: use jaeger-agent-mixin

lib got moved: https://github.com/grafana/jsonnet-libs/pull/291

used jb-0.4.0 which updates the jsonnetfile.json format

* refactor: use jb-0.4.0 jsonnetfile.json format
k26
Jeroen Op 't Eynde 5 years ago committed by GitHub
parent 81c7bd33f5
commit 96515e3116
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 23
      production/ksonnet/loki-canary/jsonnetfile.json
  2. 70
      production/ksonnet/loki/jsonnetfile.json
  3. 2
      production/ksonnet/loki/loki.libsonnet
  4. 23
      production/ksonnet/promtail/jsonnetfile.json

@ -1,14 +1,15 @@
{
"dependencies": [
{
"name": "ksonnet-util",
"source": {
"git": {
"remote": "https://github.com/grafana/jsonnet-libs",
"subdir": "ksonnet-util"
}
},
"version": "master"
"version": 1,
"dependencies": [
{
"source": {
"git": {
"remote": "https://github.com/grafana/jsonnet-libs.git",
"subdir": "ksonnet-util"
}
]
},
"version": "master"
}
],
"legacyImports": true
}

@ -1,34 +1,42 @@
{
"dependencies": [
{
"name": "ksonnet-util",
"source": {
"git": {
"remote": "https://github.com/grafana/jsonnet-libs",
"subdir": "ksonnet-util"
}
},
"version": "master"
},
{
"name": "consul",
"source": {
"git": {
"remote": "https://github.com/grafana/jsonnet-libs",
"subdir": "consul"
}
},
"version": "master"
},
{
"name": "memcached",
"source": {
"git": {
"remote": "https://github.com/grafana/jsonnet-libs",
"subdir": "memcached"
}
},
"version": "master"
"version": 1,
"dependencies": [
{
"source": {
"git": {
"remote": "https://github.com/grafana/jsonnet-libs.git",
"subdir": "consul"
}
]
},
"version": "master"
},
{
"source": {
"git": {
"remote": "https://github.com/grafana/jsonnet-libs.git",
"subdir": "jaeger-agent-mixin"
}
},
"version": "master"
},
{
"source": {
"git": {
"remote": "https://github.com/grafana/jsonnet-libs.git",
"subdir": "ksonnet-util"
}
},
"version": "master"
},
{
"source": {
"git": {
"remote": "https://github.com/grafana/jsonnet-libs.git",
"subdir": "memcached"
}
},
"version": "master"
}
],
"legacyImports": true
}

@ -1,5 +1,5 @@
(import 'ksonnet-util/kausal.libsonnet') +
(import 'ksonnet-util/jaeger.libsonnet') +
(import 'jaeger-agent-mixin/jaeger.libsonnet') +
(import 'images.libsonnet') +
(import 'common.libsonnet') +
(import 'config.libsonnet') +

@ -1,14 +1,15 @@
{
"dependencies": [
{
"name": "ksonnet-util",
"source": {
"git": {
"remote": "https://github.com/grafana/jsonnet-libs",
"subdir": "ksonnet-util"
}
},
"version": "master"
"version": 1,
"dependencies": [
{
"source": {
"git": {
"remote": "https://github.com/grafana/jsonnet-libs.git",
"subdir": "ksonnet-util"
}
]
},
"version": "master"
}
],
"legacyImports": true
}

Loading…
Cancel
Save