Skip to content

Commit

Permalink
🎨 css to handle filter and result
Browse files Browse the repository at this point in the history
  • Loading branch information
victorjourne committed Nov 3, 2023
1 parent 1e1f6c4 commit 3c0e3b3
Show file tree
Hide file tree
Showing 9 changed files with 333 additions and 181 deletions.
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ deploy-k8s-traefik:
deploy-k8s-configmap: create-namespace
kubectl create configmap env-${INDEX_NAME} --from-env-file=${ENV_FILE} --namespace ridoc -o yaml --dry-run=client | kubectl apply -f -
kubectl create configmap static-${INDEX_NAME} --from-file=${FRONTEND_STATIC_USER} --namespace ridoc -o yaml --dry-run=client | kubectl apply -f -
kubectl create configmap logstash-pipeline --from-file=logstash/pipeline/logstash.conf --namespace ridoc -o yaml --dry-run=client | kubectl apply -f -

deploy-k8s-volume: create-namespace
@cat ${KUBE_DIR}/volume.yaml | envsubst | kubectl apply -f -
Expand All @@ -193,7 +194,9 @@ deploy-traefik:

deploy-k8s-ekl: create-namespace
@echo $@
helm upgrade --install --values ${KUBE_DIR}/ekl/elasticsearch.yaml elasticsearch elastic/elasticsearch -n ridoc
#helm upgrade --install --values ${KUBE_DIR}/ekl/elasticsearch.yaml elasticsearch elastic/elasticsearch -n ridoc
@cat ${KUBE_DIR}/ekl/kibana.yaml | envsubst | helm upgrade --install kibana elastic/kibana -n ridoc -f -
#@cat ${KUBE_DIR}/ekl/logstash.yaml | envsubst | helm upgrade --install logstash elastic/logstash -n ridoc -f -

deploy-k8s-frontend: deploy-k8s-configmap
@echo $@
Expand Down
20 changes: 20 additions & 0 deletions delete-kibana-pre-install.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#!/bin/bash

name_to_delete="pre-install-kibana-kibana"
namespace="ridoc"
# Get a list of available resource types
resource_types=$(kubectl api-resources --verbs=list -o name | cut -d / -f 2)
kubectl delete configmaps kibana-kibana-helm-scripts -n ridoc
kubectl delete -n ridoc secrets kibana-kibana-es-token
kubectl delete pods --field-selector status.phase=Failed -n ridoc
kubectl delete -n ridoc deployment kibana-kibana

for resource in $resource_types; do
# List resources with the specified name
resource_list=$(kubectl get $resource -n $namespace --field-selector metadata.name=$name_to_delete --ignore-not-found=true --output=custom-columns=:.metadata.name --no-headers)
if [ -n "$resource_list" ]; then
# Delete resources with the specified name
echo "Delete $resource $resource_list"
kubectl delete $resource -n $namespace --field-selector metadata.name=$name_to_delete --ignore-not-found=true
fi
done
8 changes: 7 additions & 1 deletion deployments/ekl/elasticsearch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ resources:


#https://github.com/elastic/helm-charts/issues/1013
clusterHealthCheckParams: "timeout=10s"
clusterHealthCheckParams: "timeout=30s"
#"wait_for_status=green&timeout=1s"
secret:
enabled: true
Expand All @@ -25,6 +25,12 @@ secret:
protocol: http
createCert: false

# esConfig:
# elasticsearch.yml: |
# xpack.security.enabled: true
# xpack.security.transport.ssl.enabled: true
# xpack.security.http.ssl.enabled: true

volumeClaimTemplate:
accessModes: ["ReadWriteOnce"]
resources:
Expand Down
19 changes: 19 additions & 0 deletions deployments/ekl/kibana.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
elasticsearchHosts: "http://elasticsearch-master:9200"
imageTag: "7.17.0"

replicas: 1

resources:
requests:
cpu: "300m"
memory: "0.1Gi"
limits:
cpu: "300m"
memory: "0.5Gi"

# extraEnvs:
# - name: "NODE_OPTIONS"
# value: "--max-old-space-size=1800"
# healthCheckPath: "/api/status"
# protocol: http

4 changes: 2 additions & 2 deletions frontend/src/routes/search/ResultList.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
currentPage=1; //retour à la page initiale
}
</script>
<div class="resList flex flex-col px-40">
<div class="resList flex flex-col px-4">
<div class="mx-20 mt-4" >
<select bind:value={triselect} class= "fr-select float-right px-6 py-2 " on:change="{trier}">
<option value="" selec disabled hidden>Trier par</option>
Expand Down Expand Up @@ -161,7 +161,7 @@
background: #ffffb3
}
.resList{
max-width: 85%;
max-width: 70rem;
min-width: fit-content !important;
}
Expand Down
Loading

0 comments on commit 3c0e3b3

Please sign in to comment.