Skip to content

Commit 24412e3

Browse files
HeleneHelene
authored
Merge pull request #41 from Helene/7.0.2
changes to be included in 7.0.2
2 parents 990e7ac + ba5e969 commit 24412e3

File tree

15 files changed

+93
-22
lines changed

15 files changed

+93
-22
lines changed

‎docs/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
# Version 7.0.2 (08/02/2021)
2+
Changed the Dockerfile parent image to the registry.access.redhat.com/ubi8/ubi
3+
Changed the sleep time = 60 seconds for re-attempting to get the MetaData from the pmcollector in case no data have been returned during the bridge start instead of stopping the process directly
4+
5+
Tested with Grafana version 7.5.1 and 8.0.3
6+
7+
8+
19
# Version 7.0.1 (07/21/2021)
210
Added support for [IBM Spectrum Scale Container Native Storage Access 5.1.1.1](https://www.ibm.com/docs/en/scalecontainernative?topic=spectrum-scale-container-native-storage-access-5111)
311
- updated example deployment yaml files according the API key authentication changes introduced to the IBM Spectrum Scale Performance monitoring tool

‎docs/SUPPORT_MATRIX.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
The following matrix gives a quick overview of the supported software for the IBM Spectrum Scale bridge for Grafana packages by version number:
2+
# Version 7.0.2 (08/02/2021)
3+
- Python 3.6
4+
- CherryPy 18.6.1
5+
- IBM Spectrum Scale system must run 5.1.1 and above or
6+
- IBM Spectrum Scale Container Native Storage Access(CNSA) devices having minReleaseLevel 5.1.1.1
7+
- Grafana 8.0.0 and above
8+
29
# Version 7.0.1 (07/21/2021)
310
- Python 3.6
411
- CherryPy 18.6.0

‎docs/grafana_deployment_ocp.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
### Dependencies
66

77

8-
- RedHat community-powered Grafana operator v.3.6.0
8+
- RedHat community-powered Grafana operator v.3.10.3
99

1010
Grafana instances provided with the Openshift monitoring stack (and its dashboards) are read-only. To solve this problem, you can use the RedHat community-powered Grafana operator provided by OperatorHub.
1111

@@ -18,7 +18,7 @@
1818
Install Plugins (panels)
1919

2020

21-
The Grafana operator image could be found at [quay.io/integreatly/grafana-operator:v3.6.0](https://quay.io/integreatly/grafana-operator:v3.6.0)
21+
The Grafana operator image could be found at [quay.io/integreatly/grafana-operator:v3.10.3](https://quay.io/repository/integreatly/grafana-operator?tag=v3.10.3&tab=tags)
2222

2323

2424

‎example_deployment_scripts/grafana_datasource_deployment/README.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Example deployment of a GrafanaDataSource instance in a k8s/OCP environment
2+
3+
4+
Using the scripts in this folder you can deploy a GrafanaDataSource instance for the IBM Spectrum Scale Performance Monitoring Bridge for Grafana running in container
5+
6+
```
7+
oc adm policy add-cluster-role-to-user ibm-spectrum-scale-operator -z grafana-serviceaccount
8+
oc apply -f grafana-bridge-datasource.yaml
9+
oc describe GrafanaDataSource bridge-grafanadatasource
10+
11+
```
12+
13+
For complete deployment examples please check the project [Wiki](https://github.com/IBM/ibm-spectrum-scale-bridge-for-grafana/wiki)

‎example_deployment_scripts/grafana_deployment/grafana-bridge-datasource.yaml renamed to ‎example_deployment_scripts/grafana_datasource_deployment/grafana-bridge-datasource.yaml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
kind: GrafanaDataSource
33
metadata:
44
name: bridge-grafanadatasource
5-
namespace: <grafana-instance namespace>
5+
namespace: grafana-for-cnsa
66
spec:
77
datasources:
88
- access: proxy
@@ -13,12 +13,17 @@ spec:
1313
timeInterval: 5s
1414
tlsSkipVerify: true
1515
tlsAuth: true
16+
tsdbVersion: '2.3'
1617
name: grafana-bridge
1718
type: opentsdb
1819
secureJsonData:
1920
tlsClientCert: 'TLS cert ${TLS_CERT}'
2021
tlsClientKey: 'TLS key ${TLS_KEY}'
21-
httpHeaderValue1: 'Bearer ${BEARER_TOKEN}'
22-
url: 'https://grafana-bridge.${namespace-name of the CNSA project}.svc.cluster.local:8443'
22+
###########################################################################################
23+
#
24+
# url: 'https://$(service name of the grafana-bridge DeploymentSet).${namespace-name of the CNSA project}.svc.cluster.local:8443'
25+
#
26+
###########################################################################################
27+
url: 'https://ibm-spectrum-scale-grafana-bridge.ibm-spectrum-scale.svc.cluster.local:8443'
2328
version: 1
2429
name: grafana-bridge-datasource.yaml

‎example_deployment_scripts/grafana_deployment/README.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Example deployment of a Grafana instance in a k8s/OCP environment
2+
3+
4+
Using the scripts in this folder you can deploy a Grafana instance in the project 'grafana-for-cnsa'
5+
6+
```
7+
oc new-project grafana-for-cnsa
8+
oc apply -f operator-group.yaml
9+
oc apply -f grafana-operator-subscription.yaml
10+
oc apply -f grafana-instance-for-cnsa.yaml
11+
12+
```
13+
14+
Alternatively you can install a Grafana instance using the OpenShift Container Platform web console. Please check the instructions described in the deployment examples stored in the project [Wiki](/docs/grafana_deployment_ocp.md)

‎example_deployment_scripts/grafana_deployment/grafana-instance-for-cnss.yaml renamed to ‎example_deployment_scripts/grafana_deployment/grafana-instance-for-cnsa.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
apiVersion: integreatly.org/v1alpha1
22
kind: Grafana
33
metadata:
4-
name: grafana-for-cnss
5-
namespace: <grafana-instance namespace>
4+
namespace: grafana-for-cnsa
5+
name: grafana-for-cnsa
66
spec:
7-
ingress:
8-
enabled: true
97
config:
108
auth:
119
disable_signout_menu: true
@@ -17,6 +15,8 @@ spec:
1715
security:
1816
admin_password: secret
1917
admin_user: root
18+
ingress:
19+
enabled: true
2020
dashboardLabelSelector:
2121
- matchExpressions:
2222
- key: app

‎example_deployment_scripts/grafana_deployment/grafana-operator-subscription.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
apiVersion: operators.coreos.com/v1alpha1
2+
kind: Subscription
3+
metadata:
4+
name: grafana-operator-subscription
5+
namespace: grafana-for-cnsa
6+
spec:
7+
channel: alpha
8+
name: grafana-operator
9+
source: community-operators
10+
sourceNamespace: openshift-marketplace

‎example_deployment_scripts/grafana_deployment/operator-group.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
apiVersion: operators.coreos.com/v1
2+
kind: OperatorGroup
3+
metadata:
4+
name: ibm-spectrum-scale-operators-group
5+
namespace: grafana-for-cnsa
6+
spec:
7+
targetNamespaces:
8+
- grafana-for-cnsa

‎source/Dockerfile

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
FROM registry.access.redhat.com/ubi8/python-36
1+
FROM registry.access.redhat.com/ubi8/ubi
22

3-
RUN pip3 install --upgrade pip
4-
RUN pip3 install setuptools
5-
RUN pip3 install cherrypy
6-
RUN pip3 install urllib3
7-
RUN pip3 install requests
3+
RUN yum install -y python36 python36-devel
84

9-
CMD python3 -V
10-
CMD pip3 list
5+
RUN /usr/bin/pip3 install --upgrade pip
6+
RUN /usr/bin/pip3 install setuptools
7+
RUN /usr/bin/pip3 install cherrypy
8+
RUN /usr/bin/pip3 install urllib3
9+
RUN /usr/bin/pip3 install requests
10+
11+
RUN echo "Installed python version: $(/usr/bin/python3 -V)"
12+
RUN echo "Installed python packages: $(/usr/bin/pip3 list)"
1113

1214
USER root
1315

0 commit comments

Comments
 (0)