Replaced packagecloud repo with official Grafana repo

tasks/install.yml

@@ -31,7 +31,7 @@
 - block:
     - name: Import Grafana GPG signing key [Debian/Ubuntu]
       apt_key:
-        url: "https://packagecloud.io/gpg.key"
+        url: "https://packages.grafana.com/gpg.key"
         state: present
         validate_certs: false
       register: _add_apt_key
@@ -41,7 +41,7 @@
 
     - name: Add Grafana repository [Debian/Ubuntu]
       apt_repository:
-        repo: deb https://packagecloud.io/grafana/stable/debian/ stretch main
+        repo: deb https://packages.grafana.com/oss/deb stable main
         state: present
         update_cache: true
       register: _update_apt_cache

templates/etc/yum.repos.d/grafana.repo.j2

@@ -1,10 +1,10 @@
 {{ ansible_managed | comment }}
 [grafana]
 name=grafana
-baseurl=https://packagecloud.io/grafana/stable/el/7/$basearch
+baseurl=https://packages.grafana.com/oss/rpm
 #repo_gpgcheck=1
 enabled=1
 gpgcheck=1
-gpgkey=https://packagecloud.io/gpg.key https://grafanarel.s3.amazonaws.com/RPM-GPG-KEY-grafana
+gpgkey=https://packages.grafana.com/gpg.key
 sslverify=1
 sslcacert=/etc/pki/tls/certs/ca-bundle.crt