Merge pull request #661 from Fryguy/more_grafana_deletes

More Grafana deletes
ManageIQ · Nov 16, 2023 · d552a40 · d552a40
2 parents 8d1fef1 + 7963f89
commit d552a40
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 71 deletions.
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -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
diff --git a/app/views/layouts/_navbar.html.erb b/app/views/layouts/_navbar.html.erb
@@ -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>
diff --git a/config/settings.yml b/config/settings.yml
@@ -4,8 +4,6 @@ github_credentials:
   password:
 
 # General settings
-grafana:
-  url:
 labels:
   unassignable: {}
   unremovable: []

diff --git a/templates/bot.yaml b/templates/bot.yaml
@@ -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