sidekiq.log in admin area. Improved admin dashboard

Dmitriy Zaporozhets
1 parent 78698698
Showing 3 changed files with 56 additions and 5 deletions Show diff stats
app/assets/stylesheets/common.scss
app/views/admin/dashboard/index.html.haml
app/views/admin/logs/show.html.haml
@@ -371,6 +371,7 @@ li.note {
         font-size: 48px;
         padding: 20px;
         text-align: center;
+        font-weight: normal;
       }
     }
   }
@@ -25,17 +25,51 @@
         = link_to 'New User', new_admin_user_path, class: "btn small"
  
 .row
-  .span6
-    %h3 Latest projects
+  .span4
+    %h4 Latest projects
     %hr
     - @projects.each do |project|
       %p
         = link_to project.name_with_namespace, [:admin, project]
-  .span6
-    %h3 Latest users
+        %span.light.right
+          = time_ago_in_words project.created_at
+          ago
+
+  .span4
+    %h4 Latest users
     %hr
     - @users.each do |user|
       %p
         = link_to [:admin, user] do
           = user.name
-          %small= user.email
+        %span.light.right
+          = time_ago_in_words user.created_at
+          ago
+
+  .span4
+    %h4 Stats
+    %hr
+    %p
+      Issues
+      %span.light.right
+        = Issue.count
+    %p
+      Merge Requests
+      %span.light.right
+        = MergeRequest.count
+    %p
+      Notes
+      %span.light.right
+        = Note.count
+    %p
+      Snippets
+      %span.light.right
+        = Snippet.count
+    %p
+      SSH Keys
+      %span.light.right
+        = Key.count
+    %p
+      Milestones
+      %span.light.right
+        = Milestone.count
@@ -5,6 +5,8 @@
     = link_to "application.log", "#application", 'data-toggle' => 'tab'
   %li
     = link_to "production.log", "#production", 'data-toggle' => 'tab'
+  %li
+    = link_to "sidekiq.log", "#sidekiq", 'data-toggle' => 'tab'
  
 %p.light To prevent perfomance issues admin logs output the last 2000 lines
 .tab-content
@@ -50,3 +52,17 @@
           - Gitlab::Logger.read_latest_for('production.log').each do |line|
             %li
               %p= line
+  .tab-pane#sidekiq
+    .file_holder#README
+      .file_title
+        %i.icon-file
+        sidekiq.log
+        .right
+          = link_to '#', class: 'log-bottom' do
+            %i.icon-arrow-down
+            Scroll down
+      .file_content.logs
+        %ol
+          - Gitlab::Logger.read_latest_for('sidekiq.log').each do |line|
+            %li
+              %p= line
...	...	@@ -371,6 +371,7 @@ li.note {
371	371	font-size: 48px;
372	372	padding: 20px;
373	373	text-align: center;
	374	+ font-weight: normal;
374	375	}
375	376	}
376	377	}
...	...
...	...	@@ -25,17 +25,51 @@
25	25	= link_to 'New User', new_admin_user_path, class: "btn small"
26	26
27	27	.row
28		- .span6
29		- %h3 Latest projects
	28	+ .span4
	29	+ %h4 Latest projects
30	30	%hr
31	31	- @projects.each do \|project\|
32	32	%p
33	33	= link_to project.name_with_namespace, [:admin, project]
34		- .span6
35		- %h3 Latest users
	34	+ %span.light.right
	35	+ = time_ago_in_words project.created_at
	36	+ ago
	37	+
	38	+ .span4
	39	+ %h4 Latest users
36	40	%hr
37	41	- @users.each do \|user\|
38	42	%p
39	43	= link_to [:admin, user] do
40	44	= user.name
41		- %small= user.email
	45	+ %span.light.right
	46	+ = time_ago_in_words user.created_at
	47	+ ago
	48	+
	49	+ .span4
	50	+ %h4 Stats
	51	+ %hr
	52	+ %p
	53	+ Issues
	54	+ %span.light.right
	55	+ = Issue.count
	56	+ %p
	57	+ Merge Requests
	58	+ %span.light.right
	59	+ = MergeRequest.count
	60	+ %p
	61	+ Notes
	62	+ %span.light.right
	63	+ = Note.count
	64	+ %p
	65	+ Snippets
	66	+ %span.light.right
	67	+ = Snippet.count
	68	+ %p
	69	+ SSH Keys
	70	+ %span.light.right
	71	+ = Key.count
	72	+ %p
	73	+ Milestones
	74	+ %span.light.right
	75	+ = Milestone.count
...	...
...	...	@@ -5,6 +5,8 @@
5	5	= link_to "application.log", "#application", 'data-toggle' => 'tab'
6	6	%li
7	7	= link_to "production.log", "#production", 'data-toggle' => 'tab'
	8	+ %li
	9	+ = link_to "sidekiq.log", "#sidekiq", 'data-toggle' => 'tab'
8	10
9	11	%p.light To prevent perfomance issues admin logs output the last 2000 lines
10	12	.tab-content
...	...	@@ -50,3 +52,17 @@
50	52	- Gitlab::Logger.read_latest_for('production.log').each do \|line\|
51	53	%li
52	54	%p= line
	55	+ .tab-pane#sidekiq
	56	+ .file_holder#README
	57	+ .file_title
	58	+ %i.icon-file
	59	+ sidekiq.log
	60	+ .right
	61	+ = link_to '#', class: 'log-bottom' do
	62	+ %i.icon-arrow-down
	63	+ Scroll down
	64	+ .file_content.logs
	65	+ %ol
	66	+ - Gitlab::Logger.read_latest_for('sidekiq.log').each do \|line\|
	67	+ %li
	68	+ %p= line
...	...