Skip to content

Commit fc0ab5e

Browse files
paulparkinsonpaulparkinson
authored
observability work, grafana access (#202)
* mongodm * mongodm * mongo etc work * mongo kafka postgres work * mongo kafka postgres work * mongo kafka postgres work * removed sqlnet.ora edit * removed sqlnet.ora edit * removed sqlnet.ora edit * dotnet docker work and password/url fix * dotnet docker work and password/url fix * dotnet docker work and password/url fix * dotnet docker work and password/url fix * dotnet docker work and password/url fix * dotnet docker work and password/url fix * dotnet docker work and password/url fix * dotnet docker work and password/url fix * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * remove sqlnet.ora edit work * recovery test work * recovery test work * recovery test work * recovery test work * replace postgres configmap with secret * replace postgres configmap with secret * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * TEQ setup and tracing * mongo, postgres, kafka crash tests * mongo, postgres, kafka crash tests * grafana work * grafana work * grafana work * grafana work * grafana work * grafana work * observability work * observability work * observability work * observability work * observability work * observability work * observability work * observability work * observability work * observability work * observability work * dotnet work * dotnet work * dotnet work * dotnet work * dotnet work * observability, dotnet, go, etc. work - move kafka etc. build to nonjava * observability, dotnet, go, etc. work - move kafka etc. build to nonjava * observability, dotnet, go, etc. work - move kafka etc. build to nonjava * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * enable teq * observability * enable teq * enable teq * enable teq * enable teq * enable teq * observability work * observability work * enable teq * enable teq * enable teq * observ * enable teq * observability dash * observability * osbservability * enable teq * enable teq * enable teq * obs * obs * enable teq * obs * enable teq * observ * obs
1 parent 9883055 commit fc0ab5e

File tree

6 files changed

+55
-28
lines changed

6 files changed

+55
-28
lines changed

‎grabdish/inventory-helidon/src/main/java/io/helidon/data/examples/InventoryResource.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,12 @@
2020

2121
import io.opentracing.Tracer;
2222
import oracle.ucp.jdbc.PoolDataSource;
23+
import org.eclipse.microprofile.metrics.Counter;
24+
import org.eclipse.microprofile.metrics.Metadata;
2325
import org.eclipse.microprofile.metrics.MetricRegistry;
26+
import org.eclipse.microprofile.metrics.MetricType;
27+
28+
import static io.helidon.data.examples.InventoryServiceOrderEventConsumer.INVENTORYDOESNOTEXIST;
2429

2530
@Path("/")
2631
@ApplicationScoped

‎grabdish/observability/install.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,12 @@ echo
2121

2222
echo Installing Grafana...
2323
kubectl apply -f install/grafana.yaml -n msdataworkshop
24-
# todo remove need to change NP to LB and use ingress instead
25-
#kubectl patch svc stable-grafana -p '{"spec": {"type": "LoadBalancer"}}' -n msdataworkshop
24+
#todo instead of LB... kubectl apply -f install/grafana-ingress.yaml -n ingress-nginx
25+
kubectl create secret tls ssl-certificate-secret --key $GRABDISH_HOME/tls/tls.key --cert $GRABDISH_HOME/tls/tls.crt -n msdataworkshop
26+
kubectl apply -f install/grafana-service.yaml -n msdataworkshop
2627
echo
2728

2829
echo Installing loki-stack with Promtail...
2930
helm repo add grafana https://grafana.github.io/helm-charts
3031
helm install loki-stack grafana/loki-stack --create-namespace --namespace loki-stack --set promtail.enabled=true,loki.persistence.enabled=true,loki.persistence.size=100Gi
3132
echo
32-
33-
kubectl create -f install/grafana-ingress.yaml -n msdataworkshop

‎grabdish/observability/install/grafana-ingress.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ spec:
2020
rules:
2121
- http:
2222
paths:
23-
- path: /grafana(/|$)(.*)
24-
pathType: ImplementationSpecific
25-
backend:
26-
service:
27-
name: grafana
28-
port:
29-
number: 3000
23+
- path: /grafana(/|$)(.*)
24+
pathType: ImplementationSpecific
25+
backend:
26+
service:
27+
name: grafana
28+
port:
29+
number: 3000

‎grabdish/observability/install/grafana-service.yaml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
apiVersion: v1
2+
kind: Service
3+
metadata:
4+
annotations:
5+
service.beta.kubernetes.io/oci-load-balancer-ssl-ports: "443"
6+
service.beta.kubernetes.io/oci-load-balancer-tls-secret: ssl-certificate-secret
7+
meta.helm.sh/release-name: stable
8+
meta.helm.sh/release-namespace: msdataworkshop
9+
finalizers:
10+
- service.kubernetes.io/load-balancer-cleanup
11+
labels:
12+
app.kubernetes.io/instance: stable
13+
app.kubernetes.io/managed-by: Helm
14+
app.kubernetes.io/name: grafana
15+
app.kubernetes.io/version: 8.1.0
16+
helm.sh/chart: grafana-6.15.0
17+
name: grafana
18+
namespace: msdataworkshop
19+
spec:
20+
externalTrafficPolicy: Cluster
21+
ports:
22+
- name: service
23+
port: 443
24+
protocol: TCP
25+
targetPort: 3000
26+
selector:
27+
app.kubernetes.io/instance: stable
28+
app.kubernetes.io/name: grafana
29+
sessionAffinity: None
30+
type: LoadBalancer

‎grabdish/observability/install/grafana.yaml

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -64,18 +64,4 @@ spec:
6464
volumes:
6565
- name: grafana-pv
6666
persistentVolumeClaim:
67-
claimName: grafana-pvc
68-
---
69-
apiVersion: v1
70-
kind: Service
71-
metadata:
72-
name: grafana
73-
spec:
74-
ports:
75-
- port: 3000
76-
protocol: TCP
77-
targetPort: http-grafana
78-
selector:
79-
app: grafana
80-
sessionAffinity: None
81-
type: LoadBalancer
67+
claimName: grafana-pvc

‎grabdish/utils/non-java-builds.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
set -e
77

88
BUILDS="inventory-python inventory-nodejs inventory-dotnet inventory-go inventory-helidon-se order-mongodb-kafka inventory-postgres-kafka inventory-springboot"
9-
# we provision a repos for db-log-exporter but don't build it yet/currently
9+
# we provision a repos for db-log-exporter but it's in nested observability/db-log-exporter dir so not reusing BUILDS list to build (see DB_LOG_EXPORTER_BUILD below)
1010
REPOS="inventory-python inventory-nodejs inventory-dotnet inventory-go inventory-helidon-se order-mongodb-kafka inventory-postgres-kafka inventory-springboot db-log-exporter"
1111

1212
# Provision Repos
1313
while ! state_done NON_JAVA_REPOS; do
14-
for b in REPOS; do
14+
for b in $REPOS; do
1515
oci artifacts container repository create --compartment-id "$(state_get COMPARTMENT_OCID)" --display-name "$(state_get RUN_NAME)/$b" --is-public true
1616
done
1717
state_set_done NON_JAVA_REPOS
@@ -41,3 +41,10 @@ while ! state_done NON_JAVA_BUILDS; do
4141
wait
4242
state_set_done NON_JAVA_BUILDS
4343
done
44+
45+
# Build the db-log-exporter image
46+
while ! state_done DB_LOG_EXPORTER_BUILD; do
47+
cd $GRABDISH_HOME/observability/db-log-exporter
48+
time ./build.sh &>> $GRABDISH_LOG/build-db-log-exporter.log &
49+
state_set_done DB_LOG_EXPORTER_BUILD
50+
done

0 commit comments

Comments
 (0)