Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes for grafana and fixes after migration. #12

Merged
merged 3 commits into from
Jan 11, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file modified core/bin/gen_docs.sh
100644 → 100755
Empty file.
Empty file modified core/bin/template_engine
100644 → 100755
Empty file.
Empty file modified core/core/src/ansible/roles/common/files/operations.sh
100644 → 100755
Empty file.
4 changes: 2 additions & 2 deletions core/core/src/ansible/roles/grafana/tasks/install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,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_x86
Expand All @@ -47,7 +47,7 @@

- name: Add Grafana repository [Debian/Ubuntu]
apt_repository:
repo: deb https://packagecloud.io/grafana/stable/debian/ jessie main
repo: deb https://packages.grafana.com/oss/deb stable main
state: present
update_cache: false
register: _apt_add_repo_x86
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# {{ ansible_managed }}
[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
Empty file modified core/core/src/ansible/roles/kafka/files/kafka_generate_ssl.sh
100644 → 100755
Empty file.
Empty file modified core/core/src/docker/deploy/init.sh
100644 → 100755
Empty file.
Empty file modified core/core/src/docker/test/run.sh
100644 → 100755
Empty file.
Empty file modified core/core/src/scripts/azure/fill_in_manifest.py
100644 → 100755
Empty file.
Empty file modified core/core/src/scripts/azure/gen_templates_azure.sh
100644 → 100755
Empty file.
Empty file modified core/core/src/scripts/azure/run_build.sh
100644 → 100755
Empty file.
Empty file modified core/core/src/scripts/common/base_colors.sh
100644 → 100755
Empty file.
Empty file modified core/core/src/scripts/common/functions.sh
100644 → 100755
Empty file.
Empty file modified core/core/src/scripts/kubernetes/get-id-rsa-from-value.sh
100644 → 100755
Empty file.
Empty file modified core/core/src/scripts/kubernetes/get-init-token.sh
100644 → 100755
Empty file.
Empty file modified core/core/src/scripts/kubernetes/linux/make-executable.sh
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file modified core/core/src/scripts/kubernetes/linux/master/untaint-master.sh
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified core/core/src/scripts/vsts/run-template-engine.sh
100644 → 100755
Empty file.
Empty file modified core/core/test/kubernetes/install-test-prerequisites.sh
100644 → 100755
Empty file.
Empty file modified core/core/test/kubernetes/run-sonobuoy-test.sh
100644 → 100755
Empty file.
Empty file modified core/core/test/serverspec/rvm.sh
100644 → 100755
Empty file.
Empty file modified core/epiphany
100644 → 100755
Empty file.
Empty file modified core/proxy.sh
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion core/version.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ set -e
unset EPIPHANY_VERSION
unset EPIPHANY_VERSION_NAME

export EPIPHANY_VERSION="0.1.2"
export EPIPHANY_VERSION="0.1.20"
export EPIPHANY_VERSION_NAME="Epiphany"
39 changes: 0 additions & 39 deletions data/azure/infrastructure/README.md

This file was deleted.

Loading