Skip to content

Commit 41c6f96

Browse files
dzikowskidzikowski
authored
Merge pull request #300 from hyperledger-labs/v1.0.2
V1.0.2
2 parents c514f6c + 7656f7f commit 41c6f96

29 files changed

+127
-44
lines changed

‎.github/workflows/test-on-push.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
name: Tests
22
on:
33
push:
4-
branches:
5-
- main
64
pull_request:
75
workflow_dispatch:
86

‎CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
## 1.0.2
2+
3+
### Features
4+
5+
### Fixes
6+
7+
### Chore & Maintenance
8+
* Expose peer and orderer Prometheus metrics
9+
110
## 1.0.0
211

312
### Features

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ You may keep the script in the root directory of your project or install it glob
2323
To install it globally:
2424

2525
```bash
26-
sudo curl -Lf https://github.com/hyperledger-labs/fablo/releases/download/1.0.0/fablo.sh -o /usr/local/bin/fablo && sudo chmod +x /usr/local/bin/fablo
26+
sudo curl -Lf https://github.com/hyperledger-labs/fablo/releases/download/1.0.2/fablo.sh -o /usr/local/bin/fablo && sudo chmod +x /usr/local/bin/fablo
2727
```
2828

2929
To get a copy of Fablo for a single project, execute in the project root:
3030

3131
```bash
32-
curl -Lf https://github.com/hyperledger-labs/fablo/releases/download/1.0.0/fablo.sh -o ./fablo && chmod +x ./fablo
32+
curl -Lf https://github.com/hyperledger-labs/fablo/releases/download/1.0.2/fablo.sh -o ./fablo && chmod +x ./fablo
3333
```
3434

3535
## Getting started
@@ -259,7 +259,7 @@ The basic structure of Fablo config file is as follows:
259259
260260
```json
261261
{
262-
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.0.0/schema.json",
262+
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.0.2/schema.json",
263263
"global": { ... },
264264
"orgs": [ ... ],
265265
"channels": [ ... ],
@@ -420,7 +420,7 @@ Genrated Hooks are saved in `fablo-target/hooks`.
420420
421421
```yaml
422422
---
423-
"$schema": https://github.com/hyperledger-labs/fablo/releases/download/1.0.0/schema.json
423+
"$schema": https://github.com/hyperledger-labs/fablo/releases/download/1.0.2/schema.json
424424
global:
425425
fabricVersion: 2.3.0
426426
tls: false

‎docs/sample.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://github.com/softwaremill/fablo/releases/download/1.0.0/schema.json",
2+
"$schema": "https://github.com/softwaremill/fablo/releases/download/1.0.2/schema.json",
33
"global": {
44
"fabricVersion": "2.3.2",
55
"tls": false

‎docs/schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
],
1313
"properties": {
1414
"$schema": {
15-
"const": "https://github.com/softwaremill/fablo/releases/download/1.0.0/schema.json"
15+
"const": "https://github.com/softwaremill/fablo/releases/download/1.0.2/schema.json"
1616
},
1717
"global": {
1818
"$id": "#/properties/global",

‎e2e/__snapshots__/fablo-config-hlf1.3-2orgs-1chaincode-private-data.json.test.ts.snap

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ fi
574574
`;
575575
576576
exports[`samples/fablo-config-hlf1.3-2orgs-1chaincode-private-data.json should create proper e2e/__tmp__/samples/fablo-config-hlf1.3-2orgs-1chaincode-private-data.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf1.3-2orgs-1chaincode-private-data.json 1`] = `
577-
"FABLO_VERSION=1.0.0
577+
"FABLO_VERSION=1.0.2
578578
FABLO_BUILD=<date with git hash>
579579
FABLO_REST_VERSION=0.1.0
580580
HYPERLEDGER_EXPLORER_VERSION=1.1.8
@@ -993,6 +993,7 @@ services:
993993
command: orderer
994994
ports:
995995
- 7030:7030
996+
- 8030:9440
996997
volumes:
997998
- ../fabric-config/config/:/var/hyperledger/config
998999
- ../fabric-config/crypto-config/peerOrganizations/orderer.example.com/peers/orderer0.group1.orderer.example.com/msp/:/var/hyperledger/orderer/msp

‎e2e/__snapshots__/fablo-config-hlf1.4-1org-1chaincode-raft.json.test.ts.snap

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ fi
486486
`;
487487
488488
exports[`samples/fablo-config-hlf1.4-1org-1chaincode-raft.json should create proper e2e/__tmp__/samples/fablo-config-hlf1.4-1org-1chaincode-raft.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf1.4-1org-1chaincode-raft.json 1`] = `
489-
"FABLO_VERSION=1.0.0
489+
"FABLO_VERSION=1.0.2
490490
FABLO_BUILD=<date with git hash>
491491
FABLO_REST_VERSION=0.1.0
492492
HYPERLEDGER_EXPLORER_VERSION=1.1.8
@@ -841,6 +841,9 @@ services:
841841
- ORDERER_GENERAL_LOCALMSPID=OrdererMSP
842842
- ORDERER_GENERAL_LOCALMSPDIR=/var/hyperledger/orderer/msp
843843
- GODEBUG=netdns=go
844+
# metrics
845+
- ORDERER_OPERATIONS_LISTENADDRESS=orderer0.group1.orderer.example.com:9440
846+
- ORDERER_METRICS_PROVIDER=prometheus
844847
# enabled TLS
845848
- ORDERER_GENERAL_TLS_ENABLED=true
846849
- ORDERER_GENERAL_TLS_PRIVATEKEY=/var/hyperledger/orderer/tls/server.key
@@ -853,6 +856,7 @@ services:
853856
command: orderer
854857
ports:
855858
- 7030:7030
859+
- 8030:9440
856860
volumes:
857861
- ../fabric-config/config/:/var/hyperledger/config
858862
- ../fabric-config/crypto-config/peerOrganizations/orderer.example.com/peers/orderer0.group1.orderer.example.com/msp/:/var/hyperledger/orderer/msp

‎e2e/__snapshots__/fablo-config-hlf1.4-2orgs-1chaincode.json.test.ts.snap

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,7 @@ fi
600600
`;
601601
602602
exports[`samples/fablo-config-hlf1.4-2orgs-1chaincode.json should create proper e2e/__tmp__/samples/fablo-config-hlf1.4-2orgs-1chaincode.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf1.4-2orgs-1chaincode.json 1`] = `
603-
"FABLO_VERSION=1.0.0
603+
"FABLO_VERSION=1.0.2
604604
FABLO_BUILD=<date with git hash>
605605
FABLO_REST_VERSION=0.1.0
606606
HYPERLEDGER_EXPLORER_VERSION=1.1.8
@@ -1072,6 +1072,7 @@ services:
10721072
command: orderer
10731073
ports:
10741074
- 7030:7030
1075+
- 8030:9440
10751076
volumes:
10761077
- ../fabric-config/config/:/var/hyperledger/config
10771078
- ../fabric-config/crypto-config/peerOrganizations/orderer.example.com/peers/orderer0.group1.orderer.example.com/msp/:/var/hyperledger/orderer/msp

‎e2e/__snapshots__/fablo-config-hlf1.4-2orgs-2chaincodes-private-data.yaml.test.ts.snap

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ fi
581581
`;
582582
583583
exports[`samples/fablo-config-hlf1.4-2orgs-2chaincodes-private-data.yaml should create proper e2e/__tmp__/samples/fablo-config-hlf1.4-2orgs-2chaincodes-private-data.yaml.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf1.4-2orgs-2chaincodes-private-data.yaml 1`] = `
584-
"FABLO_VERSION=1.0.0
584+
"FABLO_VERSION=1.0.2
585585
FABLO_BUILD=<date with git hash>
586586
FABLO_REST_VERSION=0.1.0
587587
HYPERLEDGER_EXPLORER_VERSION=1.1.8
@@ -1042,6 +1042,7 @@ services:
10421042
command: orderer
10431043
ports:
10441044
- 7030:7030
1045+
- 8030:9440
10451046
volumes:
10461047
- ../fabric-config/config/:/var/hyperledger/config
10471048
- ../fabric-config/crypto-config/peerOrganizations/orderer.example.com/peers/orderer0.group1.orderer.example.com/msp/:/var/hyperledger/orderer/msp

‎e2e/__snapshots__/fablo-config-hlf1.4-2orgs-2chaincodes-raft.json.test.ts.snap

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,7 @@ fi
771771
`;
772772
773773
exports[`samples/fablo-config-hlf1.4-2orgs-2chaincodes-raft.json should create proper e2e/__tmp__/samples/fablo-config-hlf1.4-2orgs-2chaincodes-raft.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf1.4-2orgs-2chaincodes-raft.json 1`] = `
774-
"FABLO_VERSION=1.0.0
774+
"FABLO_VERSION=1.0.2
775775
FABLO_BUILD=<date with git hash>
776776
FABLO_REST_VERSION=0.1.0
777777
HYPERLEDGER_EXPLORER_VERSION=1.1.8
@@ -1284,6 +1284,9 @@ services:
12841284
- ORDERER_GENERAL_LOCALMSPID=OrdererMSP
12851285
- ORDERER_GENERAL_LOCALMSPDIR=/var/hyperledger/orderer/msp
12861286
- GODEBUG=netdns=go
1287+
# metrics
1288+
- ORDERER_OPERATIONS_LISTENADDRESS=orderer0.group1.orderer.example.com:9440
1289+
- ORDERER_METRICS_PROVIDER=prometheus
12871290
# enabled TLS
12881291
- ORDERER_GENERAL_TLS_ENABLED=true
12891292
- ORDERER_GENERAL_TLS_PRIVATEKEY=/var/hyperledger/orderer/tls/server.key
@@ -1296,6 +1299,7 @@ services:
12961299
command: orderer
12971300
ports:
12981301
- 7030:7030
1302+
- 8030:9440
12991303
volumes:
13001304
- ../fabric-config/config/:/var/hyperledger/config
13011305
- ../fabric-config/crypto-config/peerOrganizations/orderer.example.com/peers/orderer0.group1.orderer.example.com/msp/:/var/hyperledger/orderer/msp
@@ -1315,6 +1319,9 @@ services:
13151319
- ORDERER_GENERAL_LOCALMSPID=OrdererMSP
13161320
- ORDERER_GENERAL_LOCALMSPDIR=/var/hyperledger/orderer/msp
13171321
- GODEBUG=netdns=go
1322+
# metrics
1323+
- ORDERER_OPERATIONS_LISTENADDRESS=orderer1.group1.orderer.example.com:9440
1324+
- ORDERER_METRICS_PROVIDER=prometheus
13181325
# enabled TLS
13191326
- ORDERER_GENERAL_TLS_ENABLED=true
13201327
- ORDERER_GENERAL_TLS_PRIVATEKEY=/var/hyperledger/orderer/tls/server.key
@@ -1327,6 +1334,7 @@ services:
13271334
command: orderer
13281335
ports:
13291336
- 7031:7031
1337+
- 8031:9440
13301338
volumes:
13311339
- ../fabric-config/config/:/var/hyperledger/config
13321340
- ../fabric-config/crypto-config/peerOrganizations/orderer.example.com/peers/orderer1.group1.orderer.example.com/msp/:/var/hyperledger/orderer/msp
@@ -1346,6 +1354,9 @@ services:
13461354
- ORDERER_GENERAL_LOCALMSPID=OrdererMSP
13471355
- ORDERER_GENERAL_LOCALMSPDIR=/var/hyperledger/orderer/msp
13481356
- GODEBUG=netdns=go
1357+
# metrics
1358+
- ORDERER_OPERATIONS_LISTENADDRESS=orderer2.group1.orderer.example.com:9440
1359+
- ORDERER_METRICS_PROVIDER=prometheus
13491360
# enabled TLS
13501361
- ORDERER_GENERAL_TLS_ENABLED=true
13511362
- ORDERER_GENERAL_TLS_PRIVATEKEY=/var/hyperledger/orderer/tls/server.key
@@ -1358,6 +1369,7 @@ services:
13581369
command: orderer
13591370
ports:
13601371
- 7032:7032
1372+
- 8032:9440
13611373
volumes:
13621374
- ../fabric-config/config/:/var/hyperledger/config
13631375
- ../fabric-config/crypto-config/peerOrganizations/orderer.example.com/peers/orderer2.group1.orderer.example.com/msp/:/var/hyperledger/orderer/msp

‎e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.test.ts.snap

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ fi
513513
`;
514514
515515
exports[`samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json should create proper e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json 1`] = `
516-
"FABLO_VERSION=1.0.0
516+
"FABLO_VERSION=1.0.2
517517
FABLO_BUILD=<date with git hash>
518518
FABLO_REST_VERSION=0.1.0
519519
HYPERLEDGER_EXPLORER_VERSION=1.1.8
@@ -812,6 +812,9 @@ services:
812812
- ORDERER_GENERAL_LOCALMSPID=OrdererMSP
813813
- ORDERER_GENERAL_LOCALMSPDIR=/var/hyperledger/orderer/msp
814814
- GODEBUG=netdns=go
815+
# metrics
816+
- ORDERER_OPERATIONS_LISTENADDRESS=orderer0.group1.orderer.example.com:9440
817+
- ORDERER_METRICS_PROVIDER=prometheus
815818
# enabled TLS
816819
- ORDERER_GENERAL_TLS_ENABLED=true
817820
- ORDERER_GENERAL_TLS_PRIVATEKEY=/var/hyperledger/orderer/tls/server.key
@@ -824,6 +827,7 @@ services:
824827
command: orderer
825828
ports:
826829
- 7030:7030
830+
- 8030:9440
827831
volumes:
828832
- ../fabric-config/config/:/var/hyperledger/config
829833
- ../fabric-config/crypto-config/peerOrganizations/orderer.example.com/peers/orderer0.group1.orderer.example.com/msp/:/var/hyperledger/orderer/msp

‎e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ fi
423423
`;
424424
425425
exports[`samples/fablo-config-hlf2-1org-1chaincode.json should create proper e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf2-1org-1chaincode.json 1`] = `
426-
"FABLO_VERSION=1.0.0
426+
"FABLO_VERSION=1.0.2
427427
FABLO_BUILD=<date with git hash>
428428
FABLO_REST_VERSION=0.1.0
429429
HYPERLEDGER_EXPLORER_VERSION=1.1.8
@@ -774,6 +774,7 @@ services:
774774
command: orderer
775775
ports:
776776
- 7030:7030
777+
- 8030:9440
777778
volumes:
778779
- ../fabric-config/config/:/var/hyperledger/config
779780
- ../fabric-config/crypto-config/peerOrganizations/orderer.example.com/peers/orderer0.group1.orderer.example.com/msp/:/var/hyperledger/orderer/msp

‎e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1008,7 +1008,7 @@ fi
10081008
`;
10091009
10101010
exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml should create proper e2e/__tmp__/samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] = `
1011-
"FABLO_VERSION=1.0.0
1011+
"FABLO_VERSION=1.0.2
10121012
FABLO_BUILD=<date with git hash>
10131013
FABLO_REST_VERSION=0.1.0
10141014
HYPERLEDGER_EXPLORER_VERSION=1.1.8
@@ -1718,6 +1718,9 @@ services:
17181718
- ORDERER_GENERAL_LOCALMSPID=Orderer1MSP
17191719
- ORDERER_GENERAL_LOCALMSPDIR=/var/hyperledger/orderer/msp
17201720
- GODEBUG=netdns=go
1721+
# metrics
1722+
- ORDERER_OPERATIONS_LISTENADDRESS=orderer0.group1.orderer1.com:9440
1723+
- ORDERER_METRICS_PROVIDER=prometheus
17211724
# enabled TLS
17221725
- ORDERER_GENERAL_TLS_ENABLED=true
17231726
- ORDERER_GENERAL_TLS_PRIVATEKEY=/var/hyperledger/orderer/tls/server.key
@@ -1730,6 +1733,7 @@ services:
17301733
command: orderer
17311734
ports:
17321735
- 7030:7030
1736+
- 8030:9440
17331737
volumes:
17341738
- ../fabric-config/config/:/var/hyperledger/config
17351739
- ../fabric-config/crypto-config/peerOrganizations/orderer1.com/peers/orderer0.group1.orderer1.com/msp/:/var/hyperledger/orderer/msp
@@ -1749,6 +1753,9 @@ services:
17491753
- ORDERER_GENERAL_LOCALMSPID=Orderer1MSP
17501754
- ORDERER_GENERAL_LOCALMSPDIR=/var/hyperledger/orderer/msp
17511755
- GODEBUG=netdns=go
1756+
# metrics
1757+
- ORDERER_OPERATIONS_LISTENADDRESS=orderer1.group1.orderer1.com:9440
1758+
- ORDERER_METRICS_PROVIDER=prometheus
17521759
# enabled TLS
17531760
- ORDERER_GENERAL_TLS_ENABLED=true
17541761
- ORDERER_GENERAL_TLS_PRIVATEKEY=/var/hyperledger/orderer/tls/server.key
@@ -1761,6 +1768,7 @@ services:
17611768
command: orderer
17621769
ports:
17631770
- 7031:7031
1771+
- 8031:9440
17641772
volumes:
17651773
- ../fabric-config/config/:/var/hyperledger/config
17661774
- ../fabric-config/crypto-config/peerOrganizations/orderer1.com/peers/orderer1.group1.orderer1.com/msp/:/var/hyperledger/orderer/msp
@@ -1780,6 +1788,9 @@ services:
17801788
- ORDERER_GENERAL_LOCALMSPID=Orderer1MSP
17811789
- ORDERER_GENERAL_LOCALMSPDIR=/var/hyperledger/orderer/msp
17821790
- GODEBUG=netdns=go
1791+
# metrics
1792+
- ORDERER_OPERATIONS_LISTENADDRESS=orderer2.group1.orderer1.com:9440
1793+
- ORDERER_METRICS_PROVIDER=prometheus
17831794
# enabled TLS
17841795
- ORDERER_GENERAL_TLS_ENABLED=true
17851796
- ORDERER_GENERAL_TLS_PRIVATEKEY=/var/hyperledger/orderer/tls/server.key
@@ -1792,6 +1803,7 @@ services:
17921803
command: orderer
17931804
ports:
17941805
- 7032:7032
1806+
- 8032:9440
17951807
volumes:
17961808
- ../fabric-config/config/:/var/hyperledger/config
17971809
- ../fabric-config/crypto-config/peerOrganizations/orderer1.com/peers/orderer2.group1.orderer1.com/msp/:/var/hyperledger/orderer/msp
@@ -1867,6 +1879,9 @@ services:
18671879
- ORDERER_GENERAL_LOCALMSPID=Orderer2MSP
18681880
- ORDERER_GENERAL_LOCALMSPDIR=/var/hyperledger/orderer/msp
18691881
- GODEBUG=netdns=go
1882+
# metrics
1883+
- ORDERER_OPERATIONS_LISTENADDRESS=orderer0.group2.orderer2.com:9440
1884+
- ORDERER_METRICS_PROVIDER=prometheus
18701885
# enabled TLS
18711886
- ORDERER_GENERAL_TLS_ENABLED=true
18721887
- ORDERER_GENERAL_TLS_PRIVATEKEY=/var/hyperledger/orderer/tls/server.key
@@ -1879,6 +1894,7 @@ services:
18791894
command: orderer
18801895
ports:
18811896
- 7050:7050
1897+
- 8050:9440
18821898
volumes:
18831899
- ../fabric-config/config/:/var/hyperledger/config
18841900
- ../fabric-config/crypto-config/peerOrganizations/orderer2.com/peers/orderer0.group2.orderer2.com/msp/:/var/hyperledger/orderer/msp

0 commit comments

Comments
 (0)