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
2 changes: 1 addition & 1 deletion .github/workflows/is-compatible.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
- name: Setup Node.js environment
uses: actions/setup-node@v3
with:
node-version: '16'
node-version: '22.13.0'
cache: 'npm'
- name: Install dependencies
run: npm ci
Expand Down
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"cSpell.words": [
"zincobserve"
"openobserve"
]
}
6 changes: 3 additions & 3 deletions deployment/grafana.ini
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
[date_formats]
default_timezone = UTC
[server]
root_url = https://g2.gke.zinclabs.dev
root_url = https://g2.gke.openobserve.dev
[auth.google]
enabled = true
client_id = 66265839154-evvpnbl5246gau96gflonsdg15od5hs8.apps.googleusercontent.com
client_secret = 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
scopes = https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email
auth_url = https://accounts.google.com/o/oauth2/auth
token_url = https://accounts.google.com/o/oauth2/token
allowed_domains = zinclabs.io
allowed_domains = openobserve.io
allow_sign_up = true

[plugins]
enable_alpha = true
app_tls_skip_verify_insecure = false
# Enter a comma-separated list of plugin identifiers to identify plugins to load even if they are unsigned. Plugins with modified signatures are never loaded.
allow_loading_unsigned_plugins = zinclabs_openobserve
allow_loading_unsigned_plugins = openobserve
12 changes: 6 additions & 6 deletions deployment/grafana_statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: letsencrypt-prod
spec:
acme:
email: admin@zinclabs.io
email: admin@openobserve.io
privateKeySecretRef:
name: letsencrypt-prod
server: https://acme-v02.api.letsencrypt.org/directory
Expand Down Expand Up @@ -33,7 +33,7 @@ spec:
runAsUser: 10000
runAsGroup: 3000
initContainers:
- name: zincobserve-plugin-loader
- name: openobserve-plugin-loader
image: wbitt/network-multitool
imagePullPolicy: IfNotPresent
command:
Expand Down Expand Up @@ -105,10 +105,10 @@ metadata:
annotations:
cert-manager.io/issuer: letsencrypt-prod
kubernetes.io/ingress.class: nginx
name: g2.gke.zinclabs.dev
name: g2.gke.openobserve.dev
spec:
rules:
- host: g2.gke.zinclabs.dev
- host: g2.gke.openobserve.dev
http:
paths:
- pathType: Prefix
Expand All @@ -120,5 +120,5 @@ spec:
path: /
tls:
- hosts:
- g2.gke.zinclabs.dev
secretName: g2.gke.zinclabs.dev
- g2.gke.openobserve.dev
secretName: g2.gke.openobserve.dev
4 changes: 2 additions & 2 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ version: '3.0'

services:
grafana:
container_name: 'zinclabs-zincobserve'
container_name: 'openobserve'
build:
context: ./.config
args:
grafana_version: ${GRAFANA_VERSION:-9.3.8}
ports:
- 3000:3000/tcp
volumes:
- ./dist:/var/lib/grafana/plugins/zinclabs-zincobserve
- ./dist:/var/lib/grafana/plugins/openobserve
- ./provisioning:/etc/grafana/provisioning
Loading
Loading