grafana 0.8.2 → 0.8.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (28) hide show
  1. checksums.yaml +4 -4
  2. data/doc/Array.html +1 -1
  3. data/doc/Boolean.html +1 -1
  4. data/doc/FalseClass.html +1 -1
  5. data/doc/Grafana.html +1 -1
  6. data/doc/Hash.html +1 -1
  7. data/doc/Logging.html +1 -1
  8. data/doc/Object.html +1 -1
  9. data/doc/Time.html +1 -1
  10. data/doc/TrueClass.html +1 -1
  11. data/doc/_index.html +1 -1
  12. data/doc/file.README.html +1 -1
  13. data/doc/index.html +1 -1
  14. data/doc/method_list.html +33 -57
  15. data/doc/top-level-namespace.html +1 -1
  16. data/lib/grafana/admin.rb +37 -64
  17. data/lib/grafana/client.rb +0 -1
  18. data/lib/grafana/dashboard.rb +88 -37
  19. data/lib/grafana/datasource.rb +79 -31
  20. data/lib/grafana/network.rb +15 -3
  21. data/lib/grafana/organization.rb +64 -34
  22. data/lib/grafana/organizations.rb +107 -172
  23. data/lib/grafana/tags.rb +3 -8
  24. data/lib/grafana/tools.rb +2 -3
  25. data/lib/grafana/user.rb +80 -45
  26. data/lib/grafana/users.rb +97 -54
  27. data/lib/grafana/version.rb +1 -1
  28. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 1eeaff5e0d8939a347d5a71c63c189f814caa8e2
4
- data.tar.gz: f2482b7a54d099c9760b59411936913f8891a8b4
3
+ metadata.gz: bcc9d3c645a3c12b1cc31d23c9f123b10369be5b
4
+ data.tar.gz: 8f99154dd21e93476cd6a3163e32550ecdd2816a
5
5
  SHA512:
6
- metadata.gz: e29a4cce1280e602b8d5e285b8d644e925fb84f9cda344dbf60b7c867dff2e0d21065f68e3111813c8d762f9398ac681bd7ae9580fa0519e7a7f81d77a743e6a
7
- data.tar.gz: 6a119baa3ad8ca41b61529696d011d8d6ee9466ef4e519701c22bc81e901e91f0d98d460de0cab6040bfbeae42f48d0d9ea77d952594a316b77faeafa7faf8e2
6
+ metadata.gz: abef29e0ae13c67c3cfcf09a5f79a9c7f16a850b8eb7cecb023ae9ded603d49d335dd7069b696d9493efbc60dff0fdcb9a8534b8563979d4689b10ce388b0374
7
+ data.tar.gz: 560de8458cf0d3ef08cdfff425be1d3a7c435846df193931fbe1cf2bca1eedb6dda9b738d47952f27d3fdab26e48fef8cc543ffdc66b3037cdda3ed5bd104288
data/doc/Array.html CHANGED
@@ -190,7 +190,7 @@
190
190
  </div>
191
191
 
192
192
  <div id="footer">
193
- Generated on Sun Dec 10 16:07:39 2017 by
193
+ Generated on Tue Dec 12 19:57:41 2017 by
194
194
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
195
195
  0.9.11 (ruby-2.2.8).
196
196
  </div>
data/doc/Boolean.html CHANGED
@@ -112,7 +112,7 @@ href="https://stackoverflow.com/questions/3028243/check-if-ruby-object-is-a-bool
112
112
  </div>
113
113
 
114
114
  <div id="footer">
115
- Generated on Sun Dec 10 16:07:39 2017 by
115
+ Generated on Tue Dec 12 19:57:41 2017 by
116
116
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
117
117
  0.9.11 (ruby-2.2.8).
118
118
  </div>
data/doc/FalseClass.html CHANGED
@@ -122,7 +122,7 @@
122
122
  </div>
123
123
 
124
124
  <div id="footer">
125
- Generated on Sun Dec 10 16:07:39 2017 by
125
+ Generated on Tue Dec 12 19:57:41 2017 by
126
126
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
127
127
  0.9.11 (ruby-2.2.8).
128
128
  </div>
data/doc/Grafana.html CHANGED
@@ -162,7 +162,7 @@
162
162
  </div>
163
163
 
164
164
  <div id="footer">
165
- Generated on Sun Dec 10 16:07:39 2017 by
165
+ Generated on Tue Dec 12 19:57:41 2017 by
166
166
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
167
167
  0.9.11 (ruby-2.2.8).
168
168
  </div>
data/doc/Hash.html CHANGED
@@ -202,7 +202,7 @@ useableTags = tags.filter( &#39;fii&#39; )</p>
202
202
  </div>
203
203
 
204
204
  <div id="footer">
205
- Generated on Sun Dec 10 16:07:39 2017 by
205
+ Generated on Tue Dec 12 19:57:41 2017 by
206
206
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
207
207
  0.9.11 (ruby-2.2.8).
208
208
  </div>
data/doc/Logging.html CHANGED
@@ -316,7 +316,7 @@
316
316
  </div>
317
317
 
318
318
  <div id="footer">
319
- Generated on Sun Dec 10 16:07:39 2017 by
319
+ Generated on Tue Dec 12 19:57:41 2017 by
320
320
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
321
321
  0.9.11 (ruby-2.2.8).
322
322
  </div>
data/doc/Object.html CHANGED
@@ -276,7 +276,7 @@ multi_hash = multi_hash.deep_string_keys</p>
276
276
  </div>
277
277
 
278
278
  <div id="footer">
279
- Generated on Sun Dec 10 16:07:39 2017 by
279
+ Generated on Tue Dec 12 19:57:41 2017 by
280
280
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
281
281
  0.9.11 (ruby-2.2.8).
282
282
  </div>
data/doc/Time.html CHANGED
@@ -190,7 +190,7 @@
190
190
  </div>
191
191
 
192
192
  <div id="footer">
193
- Generated on Sun Dec 10 16:07:39 2017 by
193
+ Generated on Tue Dec 12 19:57:41 2017 by
194
194
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
195
195
  0.9.11 (ruby-2.2.8).
196
196
  </div>
data/doc/TrueClass.html CHANGED
@@ -122,7 +122,7 @@
122
122
  </div>
123
123
 
124
124
  <div id="footer">
125
- Generated on Sun Dec 10 16:07:39 2017 by
125
+ Generated on Tue Dec 12 19:57:41 2017 by
126
126
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
127
127
  0.9.11 (ruby-2.2.8).
128
128
  </div>
data/doc/_index.html CHANGED
@@ -370,7 +370,7 @@
370
370
  </div>
371
371
 
372
372
  <div id="footer">
373
- Generated on Sun Dec 10 16:07:39 2017 by
373
+ Generated on Tue Dec 12 19:57:40 2017 by
374
374
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
375
375
  0.9.11 (ruby-2.2.8).
376
376
  </div>
data/doc/file.README.html CHANGED
@@ -107,7 +107,7 @@ href="https://github.com/[USERNAME]/grafana">github.com/[USERNAME]/grafana</a>.<
107
107
  </div></div>
108
108
 
109
109
  <div id="footer">
110
- Generated on Sun Dec 10 16:07:39 2017 by
110
+ Generated on Tue Dec 12 19:57:41 2017 by
111
111
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
112
112
  0.9.11 (ruby-2.2.8).
113
113
  </div>
data/doc/index.html CHANGED
@@ -107,7 +107,7 @@ href="https://github.com/[USERNAME]/grafana">github.com/[USERNAME]/grafana</a>.<
107
107
  </div></div>
108
108
 
109
109
  <div id="footer">
110
- Generated on Sun Dec 10 16:07:39 2017 by
110
+ Generated on Tue Dec 12 19:57:41 2017 by
111
111
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
112
112
  0.9.11 (ruby-2.2.8).
113
113
  </div>
data/doc/method_list.html CHANGED
@@ -124,22 +124,6 @@
124
124
  </li>
125
125
 
126
126
 
127
- <li class="odd ">
128
- <div class="item">
129
- <span class='object_link'><a href="Grafana/Organizations.html#all_organizations-instance_method" title="Grafana::Organizations#all_organizations (method)">#all_organizations</a></span>
130
- <small>Grafana::Organizations</small>
131
- </div>
132
- </li>
133
-
134
-
135
- <li class="even ">
136
- <div class="item">
137
- <span class='object_link'><a href="Grafana/Users.html#all_users-instance_method" title="Grafana::Users#all_users (method)">#all_users</a></span>
138
- <small>Grafana::Users</small>
139
- </div>
140
- </li>
141
-
142
-
143
127
  <li class="odd ">
144
128
  <div class="item">
145
129
  <span class='object_link'><a href="Array.html#compare-instance_method" title="Array#compare (method)">#compare</a></span>
@@ -510,7 +494,7 @@
510
494
 
511
495
  <li class="odd ">
512
496
  <div class="item">
513
- <span class='object_link'><a href="Grafana/Organizations.html#organization_by_id-instance_method" title="Grafana::Organizations#organization_by_id (method)">#organization_by_id</a></span>
497
+ <span class='object_link'><a href="Grafana/Organizations.html#organization_users-instance_method" title="Grafana::Organizations#organization_users (method)">#organization_users</a></span>
514
498
  <small>Grafana::Organizations</small>
515
499
  </div>
516
500
  </li>
@@ -518,21 +502,13 @@
518
502
 
519
503
  <li class="even ">
520
504
  <div class="item">
521
- <span class='object_link'><a href="Grafana/Organizations.html#organization_by_name-instance_method" title="Grafana::Organizations#organization_by_name (method)">#organization_by_name</a></span>
505
+ <span class='object_link'><a href="Grafana/Organizations.html#organizations-instance_method" title="Grafana::Organizations#organizations (method)">#organizations</a></span>
522
506
  <small>Grafana::Organizations</small>
523
507
  </div>
524
508
  </li>
525
509
 
526
510
 
527
511
  <li class="odd ">
528
- <div class="item">
529
- <span class='object_link'><a href="Grafana/Organizations.html#organization_users-instance_method" title="Grafana::Organizations#organization_users (method)">#organization_users</a></span>
530
- <small>Grafana::Organizations</small>
531
- </div>
532
- </li>
533
-
534
-
535
- <li class="even ">
536
512
  <div class="item">
537
513
  <span class='object_link'><a href="Grafana/Network.html#patch-instance_method" title="Grafana::Network#patch (method)">#patch</a></span>
538
514
  <small>Grafana::Network</small>
@@ -540,7 +516,7 @@
540
516
  </li>
541
517
 
542
518
 
543
- <li class="odd ">
519
+ <li class="even ">
544
520
  <div class="item">
545
521
  <span class='object_link'><a href="Grafana/Admin.html#pause_all_alerts-instance_method" title="Grafana::Admin#pause_all_alerts (method)">#pause_all_alerts</a></span>
546
522
  <small>Grafana::Admin</small>
@@ -548,7 +524,7 @@
548
524
  </li>
549
525
 
550
526
 
551
- <li class="even ">
527
+ <li class="odd ">
552
528
  <div class="item">
553
529
  <span class='object_link'><a href="Grafana/Login.html#ping_session-instance_method" title="Grafana::Login#ping_session (method)">#ping_session</a></span>
554
530
  <small>Grafana::Login</small>
@@ -556,7 +532,7 @@
556
532
  </li>
557
533
 
558
534
 
559
- <li class="odd ">
535
+ <li class="even ">
560
536
  <div class="item">
561
537
  <span class='object_link'><a href="Grafana/Network.html#post-instance_method" title="Grafana::Network#post (method)">#post</a></span>
562
538
  <small>Grafana::Network</small>
@@ -564,7 +540,7 @@
564
540
  </li>
565
541
 
566
542
 
567
- <li class="even ">
543
+ <li class="odd ">
568
544
  <div class="item">
569
545
  <span class='object_link'><a href="Grafana/Network.html#put-instance_method" title="Grafana::Network#put (method)">#put</a></span>
570
546
  <small>Grafana::Network</small>
@@ -572,7 +548,7 @@
572
548
  </li>
573
549
 
574
550
 
575
- <li class="odd ">
551
+ <li class="even ">
576
552
  <div class="item">
577
553
  <span class='object_link'><a href="Grafana/Tools.html#regenerate_template_ids-instance_method" title="Grafana::Tools#regenerate_template_ids (method)">#regenerate_template_ids</a></span>
578
554
  <small>Grafana::Tools</small>
@@ -580,7 +556,7 @@
580
556
  </li>
581
557
 
582
558
 
583
- <li class="even ">
559
+ <li class="odd ">
584
560
  <div class="item">
585
561
  <span class='object_link'><a href="Grafana/User.html#remove_dashboard_star-instance_method" title="Grafana::User#remove_dashboard_star (method)">#remove_dashboard_star</a></span>
586
562
  <small>Grafana::User</small>
@@ -588,7 +564,7 @@
588
564
  </li>
589
565
 
590
566
 
591
- <li class="odd ">
567
+ <li class="even ">
592
568
  <div class="item">
593
569
  <span class='object_link'><a href="Grafana/Network.html#request-instance_method" title="Grafana::Network#request (method)">#request</a></span>
594
570
  <small>Grafana::Network</small>
@@ -596,7 +572,7 @@
596
572
  </li>
597
573
 
598
574
 
599
- <li class="even ">
575
+ <li class="odd ">
600
576
  <div class="item">
601
577
  <span class='object_link'><a href="Grafana/DashboardVersions.html#restore_dashboard-instance_method" title="Grafana::DashboardVersions#restore_dashboard (method)">#restore_dashboard</a></span>
602
578
  <small>Grafana::DashboardVersions</small>
@@ -604,7 +580,7 @@
604
580
  </li>
605
581
 
606
582
 
607
- <li class="odd ">
583
+ <li class="even ">
608
584
  <div class="item">
609
585
  <span class='object_link'><a href="Grafana/Dashboard.html#search_dashboards-instance_method" title="Grafana::Dashboard#search_dashboards (method)">#search_dashboards</a></span>
610
586
  <small>Grafana::Dashboard</small>
@@ -612,7 +588,7 @@
612
588
  </li>
613
589
 
614
590
 
615
- <li class="even ">
591
+ <li class="odd ">
616
592
  <div class="item">
617
593
  <span class='object_link'><a href="Grafana/Users.html#search_for_users_by-instance_method" title="Grafana::Users#search_for_users_by (method)">#search_for_users_by</a></span>
618
594
  <small>Grafana::Users</small>
@@ -620,7 +596,7 @@
620
596
  </li>
621
597
 
622
598
 
623
- <li class="odd ">
599
+ <li class="even ">
624
600
  <div class="item">
625
601
  <span class='object_link'><a href="Grafana/Tools.html#slug-instance_method" title="Grafana::Tools#slug (method)">#slug</a></span>
626
602
  <small>Grafana::Tools</small>
@@ -628,7 +604,7 @@
628
604
  </li>
629
605
 
630
606
 
631
- <li class="even ">
607
+ <li class="odd ">
632
608
  <div class="item">
633
609
  <span class='object_link'><a href="Grafana/Snapshot.html#snapshot-instance_method" title="Grafana::Snapshot#snapshot (method)">#snapshot</a></span>
634
610
  <small>Grafana::Snapshot</small>
@@ -636,7 +612,7 @@
636
612
  </li>
637
613
 
638
614
 
639
- <li class="odd ">
615
+ <li class="even ">
640
616
  <div class="item">
641
617
  <span class='object_link'><a href="Grafana/User.html#switch_current_user_organization-instance_method" title="Grafana::User#switch_current_user_organization (method)">#switch_current_user_organization</a></span>
642
618
  <small>Grafana::User</small>
@@ -644,7 +620,7 @@
644
620
  </li>
645
621
 
646
622
 
647
- <li class="even ">
623
+ <li class="odd ">
648
624
  <div class="item">
649
625
  <span class='object_link'><a href="Grafana/Alerts.html#update_alert_notification-instance_method" title="Grafana::Alerts#update_alert_notification (method)">#update_alert_notification</a></span>
650
626
  <small>Grafana::Alerts</small>
@@ -652,7 +628,7 @@
652
628
  </li>
653
629
 
654
630
 
655
- <li class="odd ">
631
+ <li class="even ">
656
632
  <div class="item">
657
633
  <span class='object_link'><a href="Grafana/Annotations.html#update_annotation-instance_method" title="Grafana::Annotations#update_annotation (method)">#update_annotation</a></span>
658
634
  <small>Grafana::Annotations</small>
@@ -660,7 +636,7 @@
660
636
  </li>
661
637
 
662
638
 
663
- <li class="even ">
639
+ <li class="odd ">
664
640
  <div class="item">
665
641
  <span class='object_link'><a href="Grafana/Organization.html#update_current_organization-instance_method" title="Grafana::Organization#update_current_organization (method)">#update_current_organization</a></span>
666
642
  <small>Grafana::Organization</small>
@@ -668,7 +644,7 @@
668
644
  </li>
669
645
 
670
646
 
671
- <li class="odd ">
647
+ <li class="even ">
672
648
  <div class="item">
673
649
  <span class='object_link'><a href="Grafana/User.html#update_current_user_password-instance_method" title="Grafana::User#update_current_user_password (method)">#update_current_user_password</a></span>
674
650
  <small>Grafana::User</small>
@@ -676,7 +652,7 @@
676
652
  </li>
677
653
 
678
654
 
679
- <li class="even ">
655
+ <li class="odd ">
680
656
  <div class="item">
681
657
  <span class='object_link'><a href="Grafana/Datasource.html#update_datasource-instance_method" title="Grafana::Datasource#update_datasource (method)">#update_datasource</a></span>
682
658
  <small>Grafana::Datasource</small>
@@ -684,7 +660,7 @@
684
660
  </li>
685
661
 
686
662
 
687
- <li class="odd ">
663
+ <li class="even ">
688
664
  <div class="item">
689
665
  <span class='object_link'><a href="Grafana/Organizations.html#update_organization-instance_method" title="Grafana::Organizations#update_organization (method)">#update_organization</a></span>
690
666
  <small>Grafana::Organizations</small>
@@ -692,7 +668,7 @@
692
668
  </li>
693
669
 
694
670
 
695
- <li class="even ">
671
+ <li class="odd ">
696
672
  <div class="item">
697
673
  <span class='object_link'><a href="Grafana/Organizations.html#update_organization_user-instance_method" title="Grafana::Organizations#update_organization_user (method)">#update_organization_user</a></span>
698
674
  <small>Grafana::Organizations</small>
@@ -700,7 +676,7 @@
700
676
  </li>
701
677
 
702
678
 
703
- <li class="odd ">
679
+ <li class="even ">
704
680
  <div class="item">
705
681
  <span class='object_link'><a href="Grafana/Users.html#update_user-instance_method" title="Grafana::Users#update_user (method)">#update_user</a></span>
706
682
  <small>Grafana::Users</small>
@@ -708,7 +684,7 @@
708
684
  </li>
709
685
 
710
686
 
711
- <li class="even ">
687
+ <li class="odd ">
712
688
  <div class="item">
713
689
  <span class='object_link'><a href="Grafana/Admin.html#update_user_password-instance_method" title="Grafana::Admin#update_user_password (method)">#update_user_password</a></span>
714
690
  <small>Grafana::Admin</small>
@@ -716,7 +692,7 @@
716
692
  </li>
717
693
 
718
694
 
719
- <li class="odd ">
695
+ <li class="even ">
720
696
  <div class="item">
721
697
  <span class='object_link'><a href="Grafana/Admin.html#update_user_permissions-instance_method" title="Grafana::Admin#update_user_permissions (method)">#update_user_permissions</a></span>
722
698
  <small>Grafana::Admin</small>
@@ -724,31 +700,31 @@
724
700
  </li>
725
701
 
726
702
 
727
- <li class="even ">
703
+ <li class="odd ">
728
704
  <div class="item">
729
- <span class='object_link'><a href="Grafana/Users.html#user_by_id-instance_method" title="Grafana::Users#user_by_id (method)">#user_by_id</a></span>
705
+ <span class='object_link'><a href="Grafana/Users.html#user-instance_method" title="Grafana::Users#user (method)">#user</a></span>
730
706
  <small>Grafana::Users</small>
731
707
  </div>
732
708
  </li>
733
709
 
734
710
 
735
- <li class="odd ">
711
+ <li class="even ">
736
712
  <div class="item">
737
- <span class='object_link'><a href="Grafana/Users.html#user_by_name-instance_method" title="Grafana::Users#user_by_name (method)">#user_by_name</a></span>
713
+ <span class='object_link'><a href="Grafana/Users.html#user_organizations-instance_method" title="Grafana::Users#user_organizations (method)">#user_organizations</a></span>
738
714
  <small>Grafana::Users</small>
739
715
  </div>
740
716
  </li>
741
717
 
742
718
 
743
- <li class="even ">
719
+ <li class="odd ">
744
720
  <div class="item">
745
- <span class='object_link'><a href="Grafana/Users.html#user_organizations-instance_method" title="Grafana::Users#user_organizations (method)">#user_organizations</a></span>
721
+ <span class='object_link'><a href="Grafana/Users.html#users-instance_method" title="Grafana::Users#users (method)">#users</a></span>
746
722
  <small>Grafana::Users</small>
747
723
  </div>
748
724
  </li>
749
725
 
750
726
 
751
- <li class="odd ">
727
+ <li class="even ">
752
728
  <div class="item">
753
729
  <span class='object_link'><a href="Grafana/Tools.html#valid_json%3F-instance_method" title="Grafana::Tools#valid_json? (method)">#valid_json?</a></span>
754
730
  <small>Grafana::Tools</small>
@@ -756,7 +732,7 @@
756
732
  </li>
757
733
 
758
734
 
759
- <li class="even ">
735
+ <li class="odd ">
760
736
  <div class="item">
761
737
  <span class='object_link'><a href="Grafana/Validator.html#validate-instance_method" title="Grafana::Validator#validate (method)">#validate</a></span>
762
738
  <small>Grafana::Validator</small>
data/doc/top-level-namespace.html CHANGED
@@ -102,7 +102,7 @@
102
102
  </div>
103
103
 
104
104
  <div id="footer">
105
- Generated on Sun Dec 10 16:07:39 2017 by
105
+ Generated on Tue Dec 12 19:57:41 2017 by
106
106
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
107
107
  0.9.11 (ruby-2.2.8).
108
108
  </div>
data/lib/grafana/admin.rb CHANGED
@@ -62,47 +62,36 @@ module Grafana
62
62
  user_name = validate( params, required: true, var: 'user_name', type: String )
63
63
  permissions = validate( params, required: true, var: 'permissions' )
64
64
  raise ArgumentError.new(format('wrong type. \'permissions\' must be an String or Hash, given %s', permissions.class.to_s ) ) unless( permissions.is_a?(String) || permissions.is_a?(Hash) )
65
+ valid_roles = ['Viewer', 'Editor', 'Read Only Editor', 'Admin']
65
66
 
66
- valid_perms = ['Viewer','Editor','Read Only Editor','Admin']
67
+ downcased = Set.new valid_roles.map(&:downcase)
67
68
 
68
- if( permissions.is_a?( String ) && !valid_perms.include?(permissions) )
69
-
70
- message = format( 'user permissions must be one of %s, given \'%s\'', valid_perms.join(', '), permissions )
71
- # logger.warn( message )
72
-
73
- return {
74
- 'status' => 404,
75
- 'name' => user_name,
76
- 'permissions' => permissions,
77
- 'message' => message
78
- }
79
-
80
- elsif( permissions.is_a?(Hash) && !permissions.dig(:grafana_admin).nil? )
69
+ if( permissions.is_a?(String) )
70
+ unless( downcased.include?( permissions.downcase ) )
71
+ return {
72
+ 'status' => 404,
73
+ 'name' => user_name,
74
+ 'permissions' => permissions,
75
+ 'message' => format( 'wrong permissions. Must be one of %s, given \'%s\'', valid_roles.join(', '), permissions )
76
+ }
77
+ end
78
+ end
81
79
 
80
+ if( permissions.is_a?(Hash) && !permissions.dig(:grafana_admin).nil? )
82
81
  grafana_admin = permissions.dig(:grafana_admin)
83
-
84
82
  unless( grafana_admin.is_a?(Boolean) )
85
-
86
- message = 'Grafana admin permission must be either \'true\' or \'false\''
87
- # logger.warn( message )
88
-
89
83
  return {
90
84
  'status' => 404,
91
85
  'name' => user_name,
92
86
  'permissions' => permissions,
93
- 'message' => message
87
+ 'message' => 'Grafana admin permission must be either \'true\' or \'false\''
94
88
  }
95
89
  end
96
90
  end
97
91
 
98
- usr = user_by_name(user_name)
92
+ usr = user(user_name)
99
93
 
100
- if( usr.nil? || usr.dig('status').to_i != 200 )
101
- return {
102
- 'status' => 404,
103
- 'message' => format('User \'%s\' not found', user_name)
104
- }
105
- end
94
+ return { 'status' => 404, 'message' => format('User \'%s\' not found', user_name) } if( usr.nil? || usr.dig('status').to_i != 200 )
106
95
 
107
96
  user_id = usr.dig('id')
108
97
 
@@ -117,24 +106,25 @@ module Grafana
117
106
  logger.debug(payload.to_json) if(@debug)
118
107
 
119
108
  return put(endpoint, payload.to_json )
120
- else
109
+ end
121
110
 
122
- org = current_organization
111
+ org = current_organization
123
112
 
124
- endpoint = format( '/api/orgs/%s/users/%s', org['id'], user_id )
125
- logger.debug( format( 'Updating user id %s permissions', user_id ) ) if @debug
113
+ return { 'status' => 404, 'message' => 'No current Organization found' } if( org.nil? || org.dig('status').to_i != 200 )
126
114
 
127
- payload = {
128
- name: org.dig('name'),
129
- orgId: org.dig('id'),
130
- role: permissions.downcase.capitalize
131
- }
115
+ endpoint = format( '/api/orgs/%s/users/%s', org.dig('id'), user_id )
116
+ logger.debug( format( 'Updating user id %s permissions', user_id ) ) if @debug
132
117
 
133
- logger.debug("Updating user id #{user_id} permissions (PATCH #{endpoint})") if @debug
134
- logger.debug(payload.to_json) if(@debug)
118
+ payload = {
119
+ name: org.dig('name'),
120
+ orgId: org.dig('id'),
121
+ role: permissions.downcase.capitalize
122
+ }
135
123
 
136
- return patch( endpoint, payload.to_json )
137
- end
124
+ logger.debug("Updating user id #{user_id} permissions (PATCH #{endpoint})") if @debug
125
+ logger.debug(payload.to_json) if(@debug)
126
+
127
+ patch( endpoint, payload.to_json )
138
128
  end
139
129
 
140
130
  # Delete an Global User
@@ -156,23 +146,12 @@ module Grafana
156
146
  raise ArgumentError.new('missing \'user_id\'') if( user_id.size.zero? )
157
147
 
158
148
  if(user_id.is_a?(String))
159
- usr = user_by_name(user_id)
149
+ usr = user(user_id)
160
150
  user_id = usr.dig('id')
161
151
  end
162
152
 
163
- if( user_id.nil? )
164
- return {
165
- 'status' => 404,
166
- 'message' => format( 'No User \'%s\' found', user_id)
167
- }
168
- end
169
-
170
- if( user_id.is_a?(Integer) && user_id.to_i.zero? )
171
- return {
172
- 'status' => 403,
173
- 'message' => format( 'Can\'t delete user id %d (admin user)', user_id )
174
- }
175
- end
153
+ return { 'status' => 404, 'message' => format( 'No User \'%s\' found', user_id) } if( user_id.nil? )
154
+ return { 'status' => 403, 'message' => format( 'Can\'t delete user id %d (admin user)', user_id ) } if( user_id.is_a?(Integer) && user_id.to_i.zero? )
176
155
 
177
156
  endpoint = format('/api/admin/users/%d', user_id )
178
157
  logger.debug( "Deleting user id #{user_id} (DELETE #{endpoint})" ) if @debug
@@ -210,7 +189,7 @@ module Grafana
210
189
  login_name = validate( params, required: false, var: 'login_name', type: String ) || user_name
211
190
  password = validate( params, required: true, var: 'password', type: String )
212
191
 
213
- usr = user_by_name(user_name)
192
+ usr = user(user_name)
214
193
 
215
194
  if( usr.nil? || usr.dig('status').to_i == 200 )
216
195
  return {
@@ -239,7 +218,6 @@ module Grafana
239
218
  post( endpoint, payload.to_json)
240
219
  end
241
220
 
242
-
243
221
  # Change Password for User
244
222
  #
245
223
  # Only works with Basic Authentication (username and password).
@@ -264,16 +242,11 @@ module Grafana
264
242
  raise ArgumentError.new('missing params') if( params.size.zero? )
265
243
 
266
244
  user_name = validate( params, required: true, var: 'user_name', type: String )
267
- password = validate( params, required: true, var: 'password', type: String )
245
+ password = validate( params, required: true, var: 'password', type: String )
268
246
 
269
- usr = user_by_name(user_name)
247
+ usr = user(user_name)
270
248
 
271
- if( usr.nil? || usr.dig('status').to_i != 200 )
272
- return {
273
- 'status' => 404,
274
- 'message' => format('User \'%s\' not found', user_name)
275
- }
276
- end
249
+ return { 'status' => 404, 'message' => format('User \'%s\' not found', user_name) } if( usr.nil? || usr.dig('status').to_i != 200 )
277
250
 
278
251
  user_id = usr.dig('id')
279
252