Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More Grafana deletes #661

Merged
merged 1 commit into from
Nov 16, 2023
Merged

More Grafana deletes #661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 0 additions & 4 deletions app/helpers/application_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,4 @@ def application_version
def time_ago_in_words_with_nil_check(time)
time.nil? ? "Never" : "#{time_ago_in_words(time).capitalize} ago"
end

def grafana_url
Settings.grafana.url
end
end
3 changes: 0 additions & 3 deletions app/views/layouts/_navbar.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav navbar-right">
<li><%= link_to("Sidekiq", "/sidekiq") %></li>
<% if grafana_url.present? %>
<li><%= link_to("Grafana", grafana_url) %></li>
<% end %>
</ul>
</div>
</div>
2 changes: 0 additions & 2 deletions config/settings.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ github_credentials:
password:

# General settings
grafana:
url:
labels:
unassignable: {}
unremovable: []
Expand Down
62 changes: 0 additions & 62 deletions templates/bot.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,68 +3,6 @@ kind: Template
metadata:
name: "bot"
objects:
### Grafana
- apiVersion: v1
kind: Service
metadata:
name: grafana
labels:
app: bot
spec:
ports:
- name: grafana
port: 3000
selector:
name: grafana
- apiVersion: apps/v1
kind: Deployment
metadata:
name: grafana
labels:
app: bot
spec:
strategy:
type: Recreate
replicas: 1
selector:
matchLabels:
name: grafana
template:
metadata:
name: grafana
labels:
name: grafana
spec:
volumes:
- name: bot-grafana-volume
persistentVolumeClaim:
claimName: bot-grafana-pvc
initContainers:
- name: grafana-data-permission-fix
image: busybox
command: ["/bin/chmod","-R","777", "/var/lib/grafana"]
volumeMounts:
- name: bot-grafana-volume
mountPath: "/var/lib/grafana"
containers:
- name: grafana
image: "docker.io/grafana/grafana:6.6.2"
ports:
- containerPort: 3000
readinessProbe:
initialDelaySeconds: 60
tcpSocket:
port: 3000
volumeMounts:
- name: bot-grafana-volume
mountPath: "/var/lib/grafana"
resources:
requests:
memory: 1Gi
cpu: 500m
limits:
memory: 4Gi

### Postgres
- apiVersion: v1
kind: ConfigMap
Expand Down