Skip to content

Commit b54251a

Browse files
committed
Resolved a merge conflict.
2 parents f17ea87 + b1de0fb commit b54251a

File tree

104 files changed

+488
-51636
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+488
-51636
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
node_modules
2-
clickhouse
2+
clickhouse
3+
build

Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ RUN /bin/bash -c 'grafana cli plugins install ae3e-plotly-panel 0.5.0'
4040
RUN /bin/bash -c 'grafana cli plugins install vertamedia-clickhouse-datasource 2.5.1'
4141
RUN /bin/bash -c 'grafana cli plugins install volkovlabs-form-panel 3.2.1'
4242

43-
# Adding basicrum-api-datasource
44-
ADD basicrum-api-datasource/dist /var/lib/grafana/plugins/basicrum-api-datasource
45-
4643
## Set Home Dashboard
47-
ENV GF_DASHBOARDS_DEFAULT_HOME_DASHBOARD_PATH=/etc/grafana/provisioning/dashboards/Hostnames.json
44+
ENV GF_DASHBOARDS_DEFAULT_HOME_DASHBOARD_PATH=/etc/grafana/provisioning/dashboards/General.json
4845

4946
# Adding datasources
50-
ADD build/datasources /etc/grafana/provisioning/datasources
47+
ADD templates/datasources /etc/grafana/provisioning/datasources
48+
49+
# Adding dashboards yaml
50+
ADD templates/dashboards /etc/grafana/provisioning/dashboards
5151

5252
# Adding dashboards
5353
ADD build/dashboards /etc/grafana/provisioning/dashboards

basicrum-api-datasource/.config/.eslintrc

Lines changed: 0 additions & 13 deletions
This file was deleted.

basicrum-api-datasource/.config/.prettierrc.js

Lines changed: 0 additions & 16 deletions
This file was deleted.

basicrum-api-datasource/.config/Dockerfile

Lines changed: 0 additions & 16 deletions
This file was deleted.

basicrum-api-datasource/.config/README.md

Lines changed: 0 additions & 164 deletions
This file was deleted.

basicrum-api-datasource/.config/jest-setup.js

Lines changed: 0 additions & 25 deletions
This file was deleted.

basicrum-api-datasource/.config/jest.config.js

Lines changed: 0 additions & 43 deletions
This file was deleted.

basicrum-api-datasource/.config/jest/mocks/react-inlinesvg.tsx

Lines changed: 0 additions & 25 deletions
This file was deleted.

basicrum-api-datasource/.config/jest/utils.js

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)