Skip to content

Commit

Permalink
Merge branch 'keyval-dev:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
alonkeyval committed Aug 24, 2023
2 parents 764b34e + a3a12a9 commit aae797f
Show file tree
Hide file tree
Showing 178 changed files with 432 additions and 15,492 deletions.
13 changes: 0 additions & 13 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,19 +55,6 @@ jobs:
context: .
push: false
tags: odiglet:pr-${{ github.event.number }}
build-ui:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Build UI Image
uses: docker/build-push-action@v4
with:
file: ui/Dockerfile
context: ui/
push: false
tags: ui:pr-${{ github.event.number }}
build-frontend:
runs-on: ubuntu-latest
steps:
Expand Down
13 changes: 2 additions & 11 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,6 @@ jobs:
ghcr.io/keyval-dev/odigos/odiglet:${{ steps.vars.outputs.tag }}
keyval/odigos-odiglet:${{ steps.vars.outputs.tag }}
platforms: linux/amd64,linux/arm64
- name: Build UI Image
uses: docker/build-push-action@v4
with:
file: ui/Dockerfile
context: ui/
push: true
tags: |
ghcr.io/keyval-dev/odigos/ui:${{ steps.vars.outputs.tag }}
keyval/odigos-ui:${{ steps.vars.outputs.tag }}
platforms: linux/amd64,linux/arm64
- uses: actions/setup-node@v3
with:
node-version: 18
Expand All @@ -90,4 +80,5 @@ jobs:
version: latest
args: release --rm-dist
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
HOMEBREW_GITHUB_API_TOKEN: ${{ secrets.HOMEBREW_GITHUB_API_TOKEN }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ dist/
node_modules
.DS_Store
.vscode
go.work.sum
19 changes: 16 additions & 3 deletions .goreleaser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,17 @@ builds:
binary: odigos-ui
archives:
- id: odigos
name_template: 'odigos_{{ .Version }}_{{ .Os }}_{{ .Arch }}'
name_template: 'cli_{{ .Version }}_{{ .Os }}_{{ .Arch }}'
builds:
- odigos
files:
- none*
- id: odigos-ui
name_template: 'odigos-ui_{{ .Version }}_{{ .Os }}_{{ .Arch }}'
name_template: 'ui_{{ .Version }}_{{ .Os }}_{{ .Arch }}'
builds:
- odigos-ui
files:
- none*

checksum:
name_template: 'checksums.txt'
snapshot:
Expand All @@ -56,6 +55,20 @@ changelog:
exclude:
- '^docs:'
- '^test:'
brews:
- tap:
owner: keyval-dev
name: homebrew-odigos-cli
token: "{{ .Env.HOMEBREW_GITHUB_API_TOKEN }}"
commit_msg_template: 'release: {{ .Tag }}'
ids:
- odigos
commit_author:
name: odigos-ci
email: info@keyval.dev
homepage: https://odigos.io
description: Odigos CLI Utility
caveats: "Thanks for installing Odigos CLI! Please run `odigos install` to install Odigos in your Kubernetes cluster."

# yaml-language-server: $schema=https://goreleaser.com/static/schema.json
# vim: set ts=2 sw=2 tw=0 fo=cnqoj
20 changes: 9 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
Generate distributed traces for any application without code changes
</p>
<h2 align="center">
<a href="https://www.youtube.com/watch?v=9d36AmVtuGU">Demo Video</a> • <a href="https://docs.odigos.io">Documentation</a> • <a href="https://join.slack.com/t/odigos/shared_invite/zt-1d7egaz29-Rwv2T8kyzc3mWP8qKobz~A">Join Slack Community</a>
<a href="https://www.youtube.com/watch?v=nynyV7FC4VI">Demo Video</a> • <a href="https://docs.odigos.io">Documentation</a> • <a href="https://join.slack.com/t/odigos/shared_invite/zt-1d7egaz29-Rwv2T8kyzc3mWP8qKobz~A">Join Slack Community</a>
</h2>

### ✨ Language Agnostic Auto-instrumentation
Expand All @@ -35,19 +35,21 @@ For a complete list of supported destinations see [here](#supported-destinations

### 🎛️ Collectors Management
Odigos automatically scales OpenTelemetry collectors based on observability data volume.
A simple UI is also provided to manage and configure collectors.
Manage and configure collectors via a convenient web UI.

![Collectors Management](assets/overview_page.png)

## Installation

The easiest way to install Odigos is to use our [Helm chart](https://github.com/keyval-dev/odigos-charts):
Installing Odigos takes less than 5 minutes, and requires no code changes.
Download our [CLI](https://docs.odigos.io/installation) and run the following command:

```console
helm repo add odigos https://keyval-dev.github.io/odigos-charts/

helm install my-odigos odigos/odigos --namespace odigos-system --create-namespace
```bash
odigos install
```

See the [quickstart guide](https://docs.odigos.io/intro) for more details and examples.
For more details see our [quickstart guide](https://docs.odigos.io/intro).

## Supported Destinations

Expand Down Expand Up @@ -92,10 +94,6 @@ Can't find the destination you need? Help us by following our quick [adding new

Please refer to the [CONTRIBUTING.md](CONTRIBUTING.md) file for information about how to get involved. We welcome issues, questions, and pull requests. You are welcome to join our active [Slack Community](https://join.slack.com/t/odigos/shared_invite/zt-1d7egaz29-Rwv2T8kyzc3mWP8qKobz~A).

## Project Status

This project is actively maintained by [keyval](https://keyval.dev). We would love to receive your [ideas, feedback & contributions](https://join.slack.com/t/odigos/shared_invite/zt-1d7egaz29-Rwv2T8kyzc3mWP8qKobz~A).

## License

This project is licensed under the terms of the Apache 2.0 open source license. Please refer to [LICENSE](LICENSE) for the full terms.
Binary file modified assets/choose_apps.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/choose_dest.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/overview_page.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 11 additions & 11 deletions autoscaler/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ require (
github.com/keyval-dev/odigos/common v0.0.0
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.27.10
k8s.io/api v0.27.4
k8s.io/apimachinery v0.27.4
k8s.io/client-go v0.27.4
k8s.io/api v0.28.0
k8s.io/apimachinery v0.28.0
k8s.io/client-go v0.28.0
sigs.k8s.io/controller-runtime v0.15.1
)

Expand All @@ -24,14 +24,14 @@ require (
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/zapr v1.2.4 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.1 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/josharian/intern v1.0.0 // indirect
Expand All @@ -51,8 +51,8 @@ require (
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.24.0 // indirect
golang.org/x/net v0.12.0 // indirect
golang.org/x/oauth2 v0.5.0 // indirect
golang.org/x/net v0.13.0 // indirect
golang.org/x/oauth2 v0.8.0 // indirect
golang.org/x/sys v0.10.0 // indirect
golang.org/x/term v0.10.0 // indirect
golang.org/x/text v0.11.0 // indirect
Expand All @@ -66,9 +66,9 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.27.2 // indirect
k8s.io/component-base v0.27.2 // indirect
k8s.io/klog/v2 v2.90.1 // indirect
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
Expand Down

0 comments on commit aae797f

Please sign in to comment.