diff --git a/grafana/create-nodepool-dib.sh b/grafana/create-nodepool-dib.sh index 46b141fbed..4a44517b05 100755 --- a/grafana/create-nodepool-dib.sh +++ b/grafana/create-nodepool-dib.sh @@ -17,7 +17,6 @@ function create { cp nodepool-dib.base.template nodepool-dib.yaml create "Ubuntu Bionic" "ubuntu-bionic" create "Ubuntu Xenial" "ubuntu-xenial" -create "Ubuntu Trusty" "ubuntu-trusty" create "Centos 7" "centos-7" create "Fedora 29" "fedora-29" create "Fedora 30" "fedora-30" diff --git a/grafana/nodepool-dib.yaml b/grafana/nodepool-dib.yaml index 91f41ab7ef..679f78d7da 100644 --- a/grafana/nodepool-dib.yaml +++ b/grafana/nodepool-dib.yaml @@ -123,58 +123,6 @@ dashboard: targets: - target: alias(keepLastValue(stats.timers.nodepool.dib_image_build.ubuntu-xenial.status.duration.mean, 'None'), "Time") refId: A -# AUTOGENERATED : Ubuntu Trusty - - - title: Ubuntu Trusty - showTitle: true - height: 200px - panels: - - title: Build status - colorBackground: true - type: singlestat - valueName: current - valueMaps: - - value: 0 - text: "OK" - - value: 1 - text: "FAILED" - thresholds: 0.1,0.9 - span: 2 - targets: - - target: "stats.gauges.nodepool.dib_image_build.ubuntu-trusty.status.rc" - valueFontSize: "50%" - - - title: Last build - type: singlestat - span: 2 - format: dateTimeFromNow - targets: - - target: "stats.gauges.nodepool.dib_image_build.ubuntu-trusty.status.last_build" - valueFontSize: "50%" - - - title: Image size - type: graph - span: 3 - yaxes: - - format: decbytes - min: 0 - - format: decbytes - min: 0 - targets: - - target: aliasByNode(stats.gauges.nodepool.dib_image_build.ubuntu-trusty.*.size, 5) - refId: A - - - title: Build duration - type: graph - span: 3 - yaxes: - - format: ms - min: 0 - - format: ms - min: 0 - targets: - - target: alias(keepLastValue(stats.timers.nodepool.dib_image_build.ubuntu-trusty.status.duration.mean, 'None'), "Time") - refId: A # AUTOGENERATED : Centos 7 - title: Centos 7 diff --git a/nodepool/elements/nodepool-base/finalise.d/89-boot-settings b/nodepool/elements/nodepool-base/finalise.d/89-boot-settings index 624553645a..537fc60fcc 100755 --- a/nodepool/elements/nodepool-base/finalise.d/89-boot-settings +++ b/nodepool/elements/nodepool-base/finalise.d/89-boot-settings @@ -178,19 +178,6 @@ echo 'include: /etc/unbound/forwarding.conf' >> /etc/unbound/unbound.conf # problems. sed -i -e 's/dlv-anchor-file:/#dlv-anchor-file:/g' /etc/unbound/unbound.conf -# This defaults file must be in place to work around this bug: -# https://bugs.launchpad.net/ubuntu/+source/unbound/+bug/988513 -# The issue is fixed for Xenial so this is only required for Trusty. -if [ "$DIB_RELEASE" == "trusty" ] ; then - cat > /etc/default/unbound <