Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix: kausalco/public -> grafana/jsonnet-libs
Whenever this migration was done, it was not complete, because there were still
some import paths referring to the old location.

This is actually a problem, because jsonnet-bundler thinks those are separate
packages, leading to unnoticed clashes
  • Loading branch information
tombrk committed Jan 14, 2020
commit 4f688942da5d0f1e306fb5e6ea682a87a5c24618
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2017 Kausal Ltd.
Copyright (c) 2020 Grafana Labs

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
4 changes: 2 additions & 2 deletions consul-mixin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<img align="right" width="200" height="129" src="dashboard.png">

Grafana dashboards and Prometheus alerts for operating Consul, in the form
of a monitoring mixin. They are easiest to use with the [prometheus-ksonnet](https://github.com/kausalco/public/tree/master/prometheus-ksonnet)
of a monitoring mixin. They are easiest to use with the [prometheus-ksonnet](https://github.com/grafana/jsonnet-libs/tree/master/prometheus-ksonnet)
package.

To install this mixin, use [ksonnet](https://ksonnet.io/):

```sh
$ go get github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb
$ jb install github.com/kausalco/public/consul-mixin
$ jb install github.com/grafana/jsonnet-libs/consul-mixin
```

Then to use, in your environment's `main.jsonnet` file:
Expand Down
4 changes: 2 additions & 2 deletions consul-mixin/jsonnetfile.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
"name": "grafana-builder",
"source": {
"git": {
"remote": "https://github.com/kausalco/public",
"remote": "https://github.com/grafana/jsonnet-libs",
"subdir": "grafana-builder"
}
},
"version": "master"
}
]
}
}
4 changes: 2 additions & 2 deletions memcached-mixin/jsonnetfile.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
"name": "grafana-builder",
"source": {
"git": {
"remote": "https://github.com/kausalco/public",
"remote": "https://github.com/grafana/jsonnet-libs",
"subdir": "grafana-builder"
}
},
"version": "master"
}
]
}
}
2 changes: 1 addition & 1 deletion oauth2-proxy/jsonnetfile.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"name": "ksonnet-util",
"source": {
"git": {
"remote": "https://github.com/kausalco/public",
"remote": "https://github.com/grafana/jsonnet-libs",
"subdir": "ksonnet-util"
}
},
Expand Down