Upgrade Grafana/InfluxDB and enable Github auth in Grafana

env/tacc/group_vars/statsservers/vars.yml

@@ -4,9 +4,18 @@ grafana_admin_user: "{{ vault_grafana_admin_user }}"
 grafana_admin_pass: "{{ vault_grafana_admin_pass }}"
 grafana_secret_key: "{{ vault_grafana_secret_key }}"
 
+stats_grafana_conf_auth_github_client_id: "{{ vault_stats_grafana_conf_auth_github_client_id }}"
+stats_grafana_conf_auth_github_client_secret: "{{ vault_stats_grafana_conf_auth_github_client_secret }}"
+stats_grafana_conf_auth_github_team_ids: "{{ vault_stats_grafana_conf_auth_github_team_ids }}"
+
 galaxy_test_grafana_db_password: "{{ vault_galaxy_test_grafana_db_password }}"
 galaxy_main_grafana_db_password: "{{ vault_galaxy_main_grafana_db_password }}"
 
+stats_grafana_conf_root_url: "https://stats.galaxyproject.org/"
+stats_grafana_conf_auth_github: true
+stats_grafana_conf_auth_github_allowed_organizations:
+  - galaxyproject
+
 statsservers_group_packages:
   - '@development'
   - python-virtualenv

env/tacc/group_vars/statsservers/vault.yml

@@ -1,18 +1,30 @@
 $ANSIBLE_VAULT;1.1;AES256
-65616165636431383534663130323638336362623033623465653330353464656635623464636137
-3664306532316239353235626537363162646164316661630a326133646534373231343863383264
-35336539353731353162393332626364383338366530613065363537656435633866393230396639
-3465323232643839380a373435313636623832303435306361353130353534623831643562353063
-63306237323038626537646138666138663839616535313331373863653037346164366465623466
-39643839396337313834613265623533353432626462303135313734343134666261653862613138
-36343039313363386637313135666664646538333039323330316631326132353030623931323962
-35323236646132346566373765383239396537653862323837336361346263323362633237353336
-63356565333335316564343334336637363161303163663934343737306230616539663533323961
-62643538383931346363373436373035326234663331386432336263323031643336343163316536
-36663333323433323037363032666430323933643239323939336261363365653130366365313738
-39623662623062643438613166616363633233663733383539393264356666393936393561326239
-35653133393161313733653565333664393737613734323161663162653736636662356363653738
-34633966363332373039613061663635613531393236326631656537313165663336313139653231
-34666333376130313935656430393130353361626162633437323236646664393735326434353834
-35313762396235646338663139653337373463623930353530663861363331353066633739396638
-33646333363162356231323939303765363339613561393438376433313964306131
+64636137376238356435643836306235373039616439626531383437373064326164343663313338
+6238353133633832396432623561393338363334303532350a393366623332303832396264666633
+34656137353566343662386639616665623234333033663363333461613436366137366437616465
+6531336631363864610a646337646662346131313537666666316466356334383464396332343236
+35363838353364303636363761623336373537663431373939616361613761303936396438653565
+65656261363662343063363065393939626438323164643064666266353563616239636436633931
+64663962313238366637656630346164343339633636303236323735636435616464386664346133
+62393866636332623461353834353365303034323135346636383531633163343933656339346434
+31386533373966373562336530343430626362326236396335613837336131633430396566386239
+66396339316431376563363630346463616530393730633762646563393432636432323830393934
+62373135646365383330323836343463323632646162653037343936333166633066313365383835
+33366165613162653761396433303762336361633834316561623366313464323261393965373832
+62333530663739366538373232656230623239363931316636333364396162663961343066366539
+63666533363366626235306430333034363137663535353565333665653361313539663764396536
+65653635643536636631383763373832633231363938396663396466306266616261316137303036
+32633538636362343732646231393361616165666562373430356563336436626165356161393231
+63613466666262653639363035303161633366623632613234303862313732656662373735663265
+64663830656236323039313964386266646131353737333934353663643866356466323163373237
+36636166333234363431313566656236326134656662303137376266323566356535353136366638
+38643238636333396565633430373061323033656337366136393938626131373537316536363233
+66613635313831666331313066316133353730646539376435346661616638306162613363643737
+34656465656264323035613531626537316361643634343534373965303264616464366432636639
+39343933393439383938373538636530623464336538333038646364653061383963343633633932
+36623038366462633233353935623138336231386164396664653466326562616231643238393835
+63643035636665333635343765353537653830313232656630373538616632613139336363386330
+65626338346465353639376565346561393964663162326138376461646538666637343862656233
+61353132323863303864373161326465343832303337343263343062623861623766656539653635
+33616330626130303663363363353037653034616234363963373664653030626264343738666136
+34383065336331646630626364376431323731643965653737643361653039653632

roles/stats/tasks/redhat.yml

@@ -32,7 +32,7 @@
   with_items:
     - name: grafana
       description: "Grafana Packages"
-      baseurl: "https://packagecloud.io/grafana/stable/el/6/$basearch"
+      baseurl: "https://packagecloud.io/grafana/stable/el/7/$basearch"
 
 - name: Install InfluxDB yum key
   copy:
@@ -100,32 +100,32 @@
         -----BEGIN PGP PUBLIC KEY BLOCK-----
         Version: GnuPG v1
 
-        mQENBFUwpBgBCADiV3hEWuw0RS5OujxKBjwPFOqgiO2r385Pa0q/AhPEmlWE0CgP
-        5oUqEfh2l99V6MhkvqDwy23qfl9UfBQ0xx3N0maGlIaNjXNdvj+Gye+M/ShFsIIx
-        O5wSvfdRpBf1bmwW+uc/moUPXAnvzjATU/pJVEGwwBu4Zpeao/VfuxY3MudxCeR5
-        CkcKthvhEIFdT5m7gXMLP3Y5bKFaquePW6MbDh0pUADz8P8T6G9Pgr/UG99SYMpI
-        rWIhuLeUYCDWzg3XiNhHpeQrsn4XGnjN4Ult5YZ1io4nrbsXkhIFhGyGv+xzzvA8
-        VIYH88O5IUWDH/SpZEjMosCy0lM4A6NqgA5jABEBAAG0HUdyYWZhbmEgPGNvbnRh
-        Y3RAZ3JhZmFuYS5vcmc+iQE4BBMBAgAiBQJVMKQYAhsDBgsJCAcDAgYVCAIJCgsE
-        FgIDAQIeAQIXgAAKCRAwo9dyPdGL3TbzB/0Y0EyfIcfa9Pc98oYFOkIYhl29B1aa
-        oCeIxjEeG41RBmuQv/SorW9POqZw7yq4KMguFf6ea5noTdhu4lGHmYeLViII2Bcy
-        yXMymuPHsqMDVGDSWoQ3cWvoOqh2+HGWxuXjOjnXIr7+kUTxb2i8b3TKHkhdCik7
-        LWD7LsSelOOTO/aIZPh6I30zd3mIRaI4+zOjs8sywULDRLGHLvLMLAleOWZ7iZXH
-        q29W8YhEAu9iVP2K4V9kGMgsM9jTonKnIUO68MqmkZTNDQ71VdW2vSQiYV41M7ad
-        2RDYekEu/4XI4czm+fahMuSJEy7X+n/jYjnhp3Kd3KvMjtbp+GDdEL16uQENBFUw
-        pBgBCACyhHnwLARkfp/i1x9tOGzF98/yA6uzXlMhb4Tp0ZS7yj6d3OgLsrDCH4zv
-        RIKM4IOBzc60/Xqhvscc/ocnfGF4fygmB2HJLDbYLbwiQawIy5BrcdR6A1uxddrD
-        FJv4rM9BZlxhA0n2MpSkp1FgveT0FeOzF9vTNMR+6gwHis/+z6ul9a7mEL6ZZ98A
-        H3zPrH6WUcGGt9/dceSLViiqD3yPjCBBJGIZUA2Me8laCv3WkeTTWEEKZfZ/5K3M
-        NbLjw06UGZGEBCexmWDK5jghGIhqV8eL2ohZidENLE/Er3NMrcCmpe+hX4otrYO3
-        eg2LkAijlLCzZExZcoiJjQAOYEs1ABEBAAGJAR8EGAECAAkFAlUwpBgCGwwACgkQ
-        MKPXcj3Ri92g2AgArG+NMyz5eyZ+D2JXL7t6gyR7xJwJM2kiggEMWQqN2Awb1lJB
-        +pUvbIbXbp/7Mwgwd7AEB5RS/x/UlCkffUYxzbEbjJ87KRdh5aZLSSm8IxmZFH0O
-        dQRjE42WuE4jSvvDCRsNsMLyiD2oZuCUN7BR0UPc5c+VMadQJVSkQIRsJn/EcdXH
-        SXMvqMC2ybGOz3c3FxjLfugssnDDyDdKJj6l5QMGSZATN/yDTw5MCJnr+zgn4+tq
-        GoeGJuLsLV64ZWF06OUlWm5I8CjbbaoC3nPLXkH9PZsnPUUh6cnMTBk+jgnw4RfO
-        PN6LmV/EcxZoXokLuBMTaNOtY5hoM6gW7C/rMA==
-        =FvSu
+        mQENBFiHXVIBCADr3VDEAGpq9Sg/xrPVu1GGqWGXdbnTbbNKeveCtFHZz7/GSATW
+        iwiY1skvlAOBiIKCqJEji0rZZgd8WxuhdfugiCBk1hDTMWCpjI0P+YymV77jHjYB
+        jHrKNlhb+aLjEd9Gf2EtbKUT1fvGUkzlVrcRGSX/XR9MBZlgja7NIyuVbn3uwZQ4
+        jflWSNSlvMpohNxTFkrBFTRrCJXhbDLfCS46+so22CP3+1VQyqJ7/6RWK9v9KYdS
+        AVNgILXMggSrMqha4WA1a/ktczVQXNtP8IuPxTdp9pNYsklOTmrFVeq3mXsvWh9Q
+        lIhpYHIZlTZ5wVBq4wTRchsXC5MubIhz+ASDABEBAAG0GkdyYWZhbmEgPGluZm9A
+        Z3JhZmFuYS5jb20+iQE4BBMBAgAiBQJYh11SAhsDBgsJCAcDAgYVCAIJCgsEFgID
+        AQIeAQIXgAAKCRCMjDTFJAmMthxJB/9Id6JrwqRkJW+eSBb71FGQmRsJvNFR8J+3
+        NPVhJNkTFFOM7TnjAMUIv+LYEURqGcceTNAN1aHq/7n/8ybXucCS0CnDYyNYpyVs
+        tWJ3FOQK3jPrmziDCWPQATqMM/Z2auXVFWrDFqfh2xKZNjuix0w2nyuWB8U0CG2U
+        89w+ksPJblGGU5xLPPzDQoAqyZXY3gpGGTkCuohMq2RWYbp/QJSQagYhQkKZoJhr
+        XJlnw4At6R1A5UUPzDw6WJqMRkGrkieE6ApIgf1vZSmnLRpXkqquRTAEyGT8Pugg
+        ee6YkD19/LK6ED6gn32StY770U9ti560U7oRjrOPK/Kjp4+qBtkQuQENBFiHXVIB
+        CACz4hO1g/4fKO9QWLcbSWpB75lbNgt1kHXP0UcW8TE0DIgqrifod09lC85adIz0
+        zdhs+00lLqckM5wNbp2r+pd5rRaxOsMw2V+c/y1Pt3qZxupmPc5l5lL6jzbEVR9g
+        ygPaE+iabTk9Np2OZQ7Qv5gIDzivqK2mRHXaHTzoQn2dA/3xpFcxnen9dvu7LCpA
+        CdScSj9/UIRKk9PHIgr2RJhcjzLx0u1PxN9MEqfIsIJUUgZOoDsr8oCs44PGGIMm
+        cK1CKALLLiC4ZM58B56jRyXo18MqB6VYsC1X9wkcIs72thL3tThXO70oDGcoXzoo
+        ywAHBH63EzEyduInOhecDIKlABEBAAGJAR8EGAECAAkFAliHXVICGwwACgkQjIw0
+        xSQJjLbWSwf/VIM5wEFBY4QLGUAfqfjDyfGXpcha58Y24Vv3n6MwJqnCIbTAaeWf
+        30CZ/wHg3NNIMB7I31vgmMOEbHQdv0LPTi9TG205VQeehcpNtZRZQ0D8TIetbxyi
+        Emmn9osig9U3/7jaAWBabE/9bGx4TF3eLlEH9wmFrNYeXvgRqmyqVoqhIMCNAAOY
+        REYyHyy9mzr9ywkwl0aroBqhzKIPyFlatZy9oRKllY/CCKO9RJy4DZidLphuwzqU
+        ymdQ1sqe5nKvwG5GvcncPc3O7LMevDBWnpNNkgERnVxCqpm90TuE3ONbirnU4+/S
+        tUsVU1DERc1fjOCnAm4pKIlNYphISIE7OQ==
+        =0pMC
         -----END PGP PUBLIC KEY BLOCK-----
     dest: "/etc/pki/rpm-gpg/RPM-GPG-KEY-grafana"
     owner: "root"
@@ -135,9 +135,10 @@
 - name: Install InfluxDB (yum)
   yum:
     name: influxdb
-    state: "{{ 'latest' if stats_upgrade else 'installed' }}"
+    state: "{{ 'latest' if stats_upgrade else 'present' }}"
     update_cache: yes
 
 - name: Install Grafana (yum)
   yum:
-    name: "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.0.4-1.x86_64.rpm"
+    name: "grafana"
+    state: "{{ 'latest' if stats_upgrade else 'present' }}"

roles/stats/templates/grafana.ini.j2

@@ -35,7 +35,7 @@ domain = stats.galaxyproject.org
 ;enforce_domain = false
 
 # The full public facing url
-;root_url = %(protocol)s://%(domain)s:%(http_port)s/
+root_url = "{{ stats_grafana_conf_root_url | default('%(protocol)s://%(domain)s:%(http_port)s/') }}"
 
 # Log web requests
 ;router_logging = false
@@ -150,16 +150,16 @@ allow_sign_up = false
 
 #################################### Github Auth ##########################
 [auth.github]
-;enabled = false
-;allow_sign_up = false
-;client_id = some_id
-;client_secret = some_secret
+enabled = {{ "true" if stats_grafana_conf_auth_github is defined and stats_grafana_conf_auth_github else "false" }}
+allow_sign_up = {{ "true" if stats_grafana_conf_auth_github is defined and stats_grafana_conf_auth_github else "false" }}
+client_id = {{ stats_grafana_conf_auth_github_client_id | default("some_id") }}
+client_secret = {{ stats_grafana_conf_auth_github_client_secret | default("some_secret") }}
 ;scopes = user:email,read:org
 ;auth_url = https://github.com/login/oauth/authorize
 ;token_url = https://github.com/login/oauth/access_token
 ;api_url = https://api.github.com/user
-;team_ids =
-;allowed_organizations =
+team_ids = {{ stats_grafana_conf_auth_github_team_ids | default([]) | join(",") }}
+allowed_organizations = {{ stats_grafana_conf_auth_github_allowed_organizations | default([]) | join(" ") }}
 
 #################################### Google Auth ##########################
 [auth.google]