Merge pull request #4 from newrelic-experimental/version-bumps

Version bumps

ansible-playbooks/roles/kafka-distribution/defaults/main.yml

@@ -1,6 +1,5 @@
 ---
 kafka_user: kafka
-kafka_version: 2.6.0
+kafka_version: 2.8.0
 kafka_scala_version: 2.13
-kafka_download_mirror_prefix: "http://mirror.cc.columbia.edu/pub/software/apache/kafka"
 kafka_install_dir: /opt

ansible-playbooks/roles/kafka-distribution/tasks/main.yml

@@ -5,12 +5,26 @@
     name: "{{ kafka_user }}"
     comment: Created by ansible
 
+- name: Get Apache mirrors
+  uri:
+    url: "{{ apache_closer_url }}"
+    method: "GET"
+  register: apache_mirrors
+
+- name: Set Download URL
+  set_fact:
+    download_url: "{{ apache_mirrors.json.preferred }}{{ apache_mirrors.json.path_info }}"
+
+- name: Print Download URL
+  debug:
+    var: download_url
+
 - name: Download Kafka Distribution
   become: yes
   become_user: "{{ kafka_user }}"
   get_url:
     dest: "/home/{{ kafka_user }}/{{ kafka_download_filename }}"
-    url: "{{ kafka_download_url }}"
+    url: "{{ download_url }}"
 
 - name: Uncompress the kafka tar
   become: yes

ansible-playbooks/roles/kafka-distribution/vars/main.yml

@@ -1,4 +1,4 @@
+apache_closer_url: "https://www.apache.org/dyn/closer.cgi?path=/kafka/{{ kafka_version }}/kafka_{{ kafka_scala_version }}-{{ kafka_version }}.tgz&as_json=1"
 kafka_download_filename: "kafka_{{ kafka_scala_version }}-{{ kafka_version }}.tgz"
-kafka_download_url: "{{ kafka_download_mirror_prefix }}/{{ kafka_version }}/{{ kafka_download_filename }}"
-kafka_versioned_home_dir: "{{ kafka_install_dir }}/{{ kafka_download_filename | regex_replace('(kafka_[\\d\\.]+-[\\d\\.]+).tgz$', '\\1')}}"
+kafka_versioned_home_dir: "{{ kafka_install_dir }}/kafka_{{ kafka_scala_version }}-{{ kafka_version }}"
 kafka_home_dir: "{{ kafka_install_dir }}/kafka"

applications/.gitignore

@@ -1,3 +1,4 @@
 docker-compose.override.yml
 .gradle
-.idea
+.idea
+build/

applications/consumer/build.gradle

@@ -6,7 +6,7 @@ repositories {
     jcenter()
 }
 
-def newrelicVersion = "6.1.0"
+def newrelicVersion = "7.0.1"
 
 configurations {
     newrelicAgent

applications/producer/build.gradle

@@ -6,7 +6,7 @@ repositories {
     jcenter()
 }
 
-def newrelicVersion = "6.1.0"
+def newrelicVersion = "7.0.1"
 
 configurations {
     newrelicAgent

terraform/playground/variables.tf

@@ -13,7 +13,7 @@ variable "new_relic_license_key" {
 
 variable "project_name" {
   type    = string
-  default = "newrelic-kakfa-playground"
+  default = "newrelic-kafka-playground"
 }
 
 variable "vpc_id" {